Commit graph

1566 commits

Author SHA1 Message Date
yflory
9e27f111cb lint compliance 2018-09-06 18:45:53 +02:00
yflory
e6743887fc Refactor contacts/messenger so that it is usable directly in the apps 2018-09-06 18:41:22 +02:00
yflory
ee1027ceb9 Ability to import mediatags to the drive 2018-08-31 15:41:08 +02:00
yflory
264f7dc6a1 Move base64 migration prompt to corner and only when the pad is stored 2018-08-30 11:21:33 +02:00
yflory
7b06626581 Merge branch 'autostore' into staging 2018-08-30 10:26:19 +02:00
yflory
90c96bfb70 Prompt users to migrate base64 images to mediatags in the pad app 2018-08-29 18:20:34 +02:00
yflory
b1f2d287b4 Add warning for chrome 68 users on Mac 2018-08-28 17:44:15 +02:00
yflory
d201e9a0cd Disable some toolbar features not available if the pad is not stored 2018-08-28 12:12:47 +02:00
yflory
9ebb598467 Make automatic pad storage configurable 2018-08-28 11:42:48 +02:00
yflory
62817d09cb Merge branch 'master' into staging 2018-08-27 15:10:00 +02:00
yflory
e8a5244362 Autostore base 2018-08-27 14:58:09 +02:00
yflory
294fa38137 Add blockbase64 plugin to ckeditor 2018-08-27 14:57:38 +02:00
yflory
fddff11fae Rename shared drive to shared folder 2018-08-22 17:01:44 +02:00
ansuz
9fe78dcc5f bump version from 2.5.0 to 2.6.0 2018-08-22 15:32:47 +02:00
ansuz
2259d1b6ac Merge branch 'soon' into staging 2018-08-16 13:33:09 +02:00
ansuz
8a113d742e
Merge pull request #245 from xwiki-labs/issue-169-anchors-should-output-anchors
#169: First anchor test and restore of the CKEditor anchor function.
2018-08-14 17:32:16 +02:00
Paul Libbrecht
6f1b269230 Update to latest translations version and more cleanup of Du/Dein. Paul 2018-08-07 23:46:31 +02:00
ansuz
912a9d569c Merge branch 'revised-german' into soon 2018-08-07 12:03:21 +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
yflory
a65e083fca Change PCS template icons 2018-07-28 11:38:22 +02:00
yflory
37f22550fe Use the settings spinner in the loading screen 2018-07-25 15:00:02 +02:00
yflory
f2baaf5b5b Fix shared folders issues including disappearing folders 2018-07-20 18:28:56 +02:00
yflory
8ab786e7df Drive restore loading screen text 2018-07-19 18:49:14 +02:00
ansuz
97142b2b32 add footer to homepage 2018-07-19 17:39:21 +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
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
e2600e4b36 display a loading screen while users are changing their passwords 2018-07-18 15:53:12 +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
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
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
yflory
3fe150f936 Fix UI issues in the PCS with IE 2018-07-18 11:40:28 +02:00
yflory
08005a709e Add a share icon in the drive when displaying a shared folder 2018-07-17 16:38:20 +02:00
Caleb James DeLisle
38a1e5e39f Add fallback for browsers which do not support CSS variables 2018-07-17 16:21:54 +02:00
ansuz
ee16b3ab15 modified english translations 2018-07-17 16:07:08 +02:00
yflory
9157403946 Update French translation 2018-07-17 16:06:12 +02:00
yflory
6143bceabb Fix XXX 2018-07-17 15:38:23 +02:00
ansuz
4bf741e959 fix typo in translations 2018-07-17 14:54:54 +02:00
ansuz
a2fd32d6a3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-17 14:49:19 +02:00
ansuz
32d84e8f36 initialize new registrations with a v2 hash 2018-07-17 14:49:03 +02:00
ansuz
e6d4bced18 clean up extraneous variables and log statements 2018-07-17 14:34:25 +02:00
yflory
ecb9f039b1 Fix pad password change not reloading with the correct URL 2018-07-17 12:27:23 +02:00
ansuz
8a18698c03 initialize newly registered users with a v2 drive hash 2018-07-16 17:08:35 +02:00