207 Commits

Author SHA1 Message Date
23f9861d61 Merge branch 'feature/help_command' into dev 2017-04-06 13:00:56 +02:00
ee0c0b3e25 Adds help (or ?) command + Commands name may be in upper-case now 2017-04-06 13:00:43 +02:00
9745cf186c Merge branch 'improvement/add_user_procedure' into dev 2017-04-02 14:41:53 +02:00
35c2f659b9 New procedure to add an user + Now throws real errors with 'ulCommands' 2017-04-02 14:41:44 +02:00
471e6c23fd Now we'll really be able to create a new users group 2017-04-02 14:41:22 +02:00
a48ab2e7b6 Fix README typo & Arguments 2017-04-02 14:40:24 +02:00
3a28933737 Merge branch 'fix/vimACL' into dev 2017-04-02 13:35:23 +02:00
4328e37fde update README + fix acl with file 2017-04-02 13:35:23 +02:00
ab2d8e867b Merge branch 'feature/changePassword' into dev 2017-04-02 12:17:29 +02:00
7e65de5260 Implements passwd procedure + Checks arguments number of 'ulCommands' 2017-04-02 12:17:14 +02:00
0920791883 Removes authentication on updatePassword() userList's method 2017-04-02 12:13:56 +02:00
fc71221a2f Fix' typo and little things 2017-04-02 12:13:12 +02:00
d32a3c5a1e Merge branch 'hotfix/reUntrackDataFiles' into dev 2017-03-30 22:36:06 +02:00
de0a76b6c5 Improves .gitignore 2017-03-30 22:35:59 +02:00
8adba4d41a Untrack these files ! (last time ?) 2017-03-30 22:35:40 +02:00
746e675787 Merge branch 'restructure/commonFolder' into dev
Conflicts:
	Server/Data/passwd.json
	Server/Data/shadow.json
	passwd.json.default
	setUpWorkingEnvironment.sh
	shadow.json.default
	src/Server/Data/passwd.json
	src/Server/Data/shadow.json
	src/server.py
2017-03-30 18:04:06 +02:00
a7baa49c01 Creates src dir and Common dir
Separates source code in src and creates Common dir for Common module
in client and server
2017-03-30 17:15:00 +02:00
5496ca2940 Merge branch 'fix_improvements/defaultConfiguration_VIM' into dev 2017-03-30 12:41:55 +02:00
f55a6d52b9 Now VIM won't be able to create swap files + Removes a debug print 2017-03-30 12:41:06 +02:00
59098fe086 Improvements: Error visibility on start 2017-03-30 12:40:00 +02:00
3e6363a567 Fall back default password to normal... 2017-03-30 12:39:50 +02:00
a6cbc6a76a Merge branch 'fix/duplicateRights' into dev 2017-03-30 11:20:01 +02:00
c28db25721 Fix duplicate rights + admin is god + change file's owner 2017-03-30 11:20:01 +02:00
5a74980326 Merge branch 'improvements/projectRepository' into dev 2017-03-30 10:56:20 +02:00
ba5da75038 Improves README + Fix' for Git ignored (but tracked) files issue 2017-03-30 10:55:20 +02:00
3dbdead22f removing files from version control 2017-03-30 10:00:29 +02:00
c89459c438 Merge branch 'fix/newUlIntegration' into dev 2017-03-30 09:48:06 +02:00
c9d5c3f195 fix name + entête 2017-03-30 09:46:13 +02:00
c91c41ae17 Nouvelles fonctions pour admin + restructuration 2017-03-29 19:03:51 +02:00
024ccbd30f Merge branch 'improvements/defaultConfiguration' into dev 2017-03-26 11:26:26 +02:00
21b93ec7bc Reduces an ACL's function complexity accorded to new data configuration 2017-03-26 11:26:08 +02:00
358449a9ed Adds default configuration files for minimal usage ('admin' + 'user') 2017-03-26 11:25:01 +02:00
34ef05454e Merge branch 'dev'
Release 1.0
v1.0
2017-03-25 23:02:06 +01:00
3d33f21e0f Merge branch 'fix/SSLReIntegration' into dev 2017-03-25 20:55:11 +01:00
0d5831e41e SSL is back onboard again ! Popen idea @CaumartinYann 2017-03-25 20:55:09 +01:00
abb43d01b4 Merge branch 'fix/move_acl' into dev 2017-03-23 11:23:08 +01:00
cfafb3f789 Fix mv and cp 2017-03-23 11:20:25 +01:00
d4f2786813 Merge branch 'improvement/exceptionIsAClass' into dev 2017-03-23 09:17:14 +01:00
bd821ad960 Changes exception class name 2017-03-23 09:17:03 +01:00
2ca9e8ba2d Merge branch 'feature_improvements/fileEdition_ACL_fileReadOnly' into dev 2017-03-22 13:43:59 +01:00
3a13d02ddb Optimizes file commands + Adds read only operation on text file + README 2017-03-22 13:43:48 +01:00
899545aada Merge branch 'feature/textEditor' into dev
File editing with vim is incompatible with SSL
for now. To be fixed.
2017-03-21 22:22:52 +01:00
dd3df56c14 Add file editing with vim from the client. 2017-03-21 20:15:25 +01:00
bcdc8c0a4d Merge branch 'feature/UL_integration' into dev 2017-03-19 16:11:32 +01:00
fd5f0f40e8 Intégration UserList + exception 2017-03-19 16:08:20 +01:00
c41341aec1 Merge branch 'feature/bruteForceLimiter' into dev 2017-03-18 13:08:39 +01:00
8c36542211 Adds a timer to limit brute force attacks (random-based duration) 2017-03-18 13:06:14 +01:00
8bc6d5bd77 Merge branch 'feature/integrityCheck' into dev 2017-03-16 18:58:12 +01:00
bb120002a8 Removes some file versions + Adds integrity check of ACL & DB 2017-03-16 18:58:02 +01:00
4a11b311a5 Merge branch 'improvements/socketsName' into dev 2017-03-16 17:44:41 +01:00