dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,317 Commits 99 Branches 133 Tags 566 MiB
Commit Graph

5317 Commits

Author SHA1 Message Date
ansuz dc122e424c Merge branch 'master' into soon 2018-08-07 11:41:37 +02:00
ansuz f5172fd05f Merge branch 'soon' into staging 2018-08-07 11:40:50 +02:00
ansuz 24c7ce57e1 apply the fix for password change recommended by @sairim 2018-08-07 11:40:21 +02:00
Paul Libbrecht 365d17e275
Merge branch 'master' into revised-german 2018-08-03 18:01:16 +02:00
Adel Atallah 6d4cf50fa8 Fix typo 2018-08-01 21:53:03 +02:00
Adel Atallah 3026a1bf9b Fix an anchor link in the readme file 2018-07-30 22:14:43 +02:00
yflory a65e083fca Change PCS template icons 2018-07-28 11:38:22 +02:00
yflory 33fb48d59a Update shared folder icon in the drive 2018-07-28 09:10:11 +02:00
yflory 9a6fa4cbe2 Create a copy when uploading an owned file in a shared folder 2018-07-28 08:58:16 +02:00
yflory 55715748cc Fix typo in contacts app preventing new lines 2018-07-27 13:21:41 +02:00
yflory 37f22550fe Use the settings spinner in the loading screen 2018-07-25 15:00:02 +02:00
yflory 20a9eee719 Disable shared folders creation by default 2018-07-20 18:41:14 +02:00
yflory f2baaf5b5b Fix shared folders issues including disappearing folders 2018-07-20 18:28:56 +02:00
yflory 4325ed4dde Fix small UI issues in drive 2018-07-20 12:29:18 +02:00
yflory bad1d7311a Fix drive tests 2018-07-20 12:04:42 +02:00
yflory 8ab786e7df Drive restore loading screen text 2018-07-19 18:49:14 +02:00
yflory 362579f79f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-19 17:52:07 +02:00
yflory d816a2ed9f Prevent timeout when restoring drive 2018-07-19 17:51:38 +02:00
ansuz 97142b2b32 add footer to homepage 2018-07-19 17:39:21 +02:00
yflory 2be78deb93 Fix Drive history 2018-07-19 17:07:14 +02:00
yflory 8b20b14184 Fix current path in toolbar reversing some names 2018-07-19 16:38:41 +02:00
yflory c08951dd91 Press enter to create a shared folder when typing its name 2018-07-19 15:33:20 +02:00
yflory 8c20c7823e Empty trash callback was missing 2018-07-19 15:32:45 +02:00
yflory 1e092f36ba Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-19 11:43:06 +02:00
yflory ae17427e00 Shared Drive text & French translation 2018-07-19 11:42:54 +02:00
ansuz 6922bc1e08 lint compliance 2018-07-19 11:14:52 +02:00
yflory a95cf85f20 Fix shared folder creation using the wrong icon 2018-07-19 10:57:31 +02:00
ansuz fcc54a3c34 Merge branch 'docker-fix-rename' into staging 2018-07-19 10:33:23 +02:00
ansuz a090dc52db flow compliance 2018-07-19 10:33:01 +02:00
Caleb James DeLisle 5527949c70 Make LessLoader flow properly, sorry about that 2018-07-18 16:22:44 +02:00
ansuz 0769452f04 Merge branch 'soon' 2018-07-18 16:01:52 +02:00
ansuz 7004f26730 update documentation 2018-07-18 16:01:27 +02:00
ansuz a181c09a68 Merge branch 'soon' into staging 2018-07-18 15:56:44 +02:00
ansuz 58332a9ce3 add french translation for password change loading screen 2018-07-18 15:56:13 +02:00
ansuz c1eb6d6a01 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2018-07-18 15:53:26 +02:00
ansuz e2600e4b36 display a loading screen while users are changing their passwords 2018-07-18 15:53:12 +02:00
yflory ebce0024d7 Merge branch 'soon' into staging 2018-07-18 15:13:58 +02:00
yflory f97685cc15 lint compliance 2018-07-18 15:12:07 +02:00
yflory ef73cf89cd Merge branch 'soon' into staging 2018-07-18 15:10:23 +02:00
yflory 8eccffd8e4 Don't remove migrated read-only pads 2018-07-18 14:56:49 +02:00
yflory 36480cf746 New default app colors 2018-07-18 14:50:05 +02:00
yflory 2b1ed904f7 lesshint compliance 2018-07-18 14:31:01 +02:00
yflory 64b51f3a80 jshint compliance 2018-07-18 14:25:48 +02:00
yflory ebfa2c2dc3 Merge branch 'less-less' into staging 2018-07-18 14:18:37 +02:00
yflory aafcb1bc02 Merge branch 'sharedfolder' into staging 2018-07-18 14:18:30 +02:00
Caleb James DeLisle 8d95efa144 Reference the relevant line in alertify.js 2018-07-18 13:22:27 +02:00
Caleb James DeLisle a57a8e51a1 Prevent alertify.js from overriding styles 2018-07-18 13:20:16 +02:00
Caleb James DeLisle a2e096b6f3 Unfortunately, optional parameters need to be optional in both .<filename>_vars() and .<filename>_main() 2018-07-18 12:58:24 +02:00
Caleb James DeLisle f1642fca89 Test before pushing :| 2018-07-18 12:53:32 +02:00
Caleb James DeLisle 83ec00d948 Added fallbacks for avatar.less 2018-07-18 12:48:51 +02:00