448 Commits

Author SHA1 Message Date
yflory
bdc00a2413 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-22 12:25:48 +01:00
yflory
0ce17ebbad CryptDrive usability improvements (new file in drive + context menu) 2017-02-22 12:25:29 +01:00
ansuz
1494387c9f ignore a line for jshint 2017-02-22 11:17:12 +01:00
yflory
e73b4a1131 Don't display 'All files' in the menu 2017-02-22 11:15:29 +01:00
ansuz
33e2c8676e assign updated key to what it should actually be 2017-02-22 11:15:25 +01:00
ansuz
641c805518 unbreak ckeditor 2017-02-21 18:59:42 +01:00
ansuz
fac5a043ca Merge pull request #88 from pbondoer/staging
Update Spanish translation 🇪🇸
2017-02-21 18:54:09 +01:00
yflory
e5179a1b3f Translate pad initial state in french 2017-02-21 18:48:01 +01:00
Pierre Bondoerffer
328e3e71d9
Some UI fixes for Spanish 2017-02-21 18:47:32 +01:00
yflory
2e378564d0 Make the 'pad' initial state translatable 2017-02-21 18:43:26 +01:00
ansuz
c0989f64fa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-21 18:21:39 +01:00
ansuz
3d0e7cb9a7 pull ckeditor config out of main.js 2017-02-21 18:21:30 +01:00
yflory
81fbe0fdd1 Add back some translation keys that shouldn't have been removed 2017-02-21 18:21:11 +01:00
Pierre Bondoerffer
f08d43d2a0
Slight fixup 2017-02-21 18:02:12 +01:00
Pierre Bondoerffer
fc2aac2d1b
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 2017-02-21 18:00:27 +01:00
Pierre Bondoerffer
1438f6b84b
Update Spanish translation 🇪🇸 2017-02-21 17:56:02 +01:00
ansuz
ed19c6885d join array in messages.js 2017-02-21 17:16:56 +01:00
yflory
20b08a7847 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-21 14:16:35 +01:00
yflory
47b8fefd9e Load messages.js only once, in cryptpad-common 2017-02-21 14:16:23 +01:00
ansuz
5276dac7cc safely handle keys which aren't strings 2017-02-21 12:29:47 +01:00
yflory
b55ded454b Update README #2 2017-02-21 11:13:10 +01:00
yflory
f17b84d7e9 Update README about translations 2017-02-21 11:11:38 +01:00
yflory
3b71c8b0b5 Missing translations are now returned as an array of arrays 2017-02-21 10:53:30 +01:00
yflory
11d9c9e813 Merge branch 'master' into staging 2017-02-21 10:44:03 +01:00
yflory
454d1c2052 Do not load all the translations anymore, only the needed one 2017-02-20 18:29:06 +01:00
yflory
434c3a220c Remove old translation keys #2 2017-02-20 16:15:13 +01:00
yflory
d81d17b86c Remove old translations keys no longer used 2017-02-17 17:39:27 +01:00
yflory
a6497f7a52 Add a way to show the drive tips again 2017-02-17 16:56:59 +01:00
ansuz
8167ed9048 implement cache-busting everywhere 2017-02-17 12:39:01 +01:00
ansuz
66a21bb45c implement cache-busting everywhere 2017-02-17 12:38:10 +01:00
ansuz
c9b8889380 add cache-busting to chainpad-crypto 2017-02-17 11:26:43 +01:00
ansuz
09fade6127 add cache-busting to chainpad-crypto 2017-02-17 11:25:35 +01:00
yflory
550c65aae0 Add a default pad in CryptDrive after signing up 2017-02-16 18:10:12 +01:00
yflory
b4128ee313 Fix typo 2017-02-16 17:26:51 +01:00
yflory
e4dbe97d71 Update display name in realtime across tabs and remember 'anonymous' name 2017-02-16 15:35:03 +01:00
yflory
7497e0d1c5 Add a dropdown user menu to the top bar in static pages 2017-02-15 17:57:42 +01:00
yflory
0e76b18278 Hide the links in the html topbar on small screens 2017-02-15 14:23:56 +01:00
yflory
0a43570990 Add the new files for the settings app 2017-02-14 19:07:17 +01:00
yflory
cd9cea8fa4 Create a settings app to manage user objects 2017-02-14 19:04:57 +01:00
yflory
318cec5f91 Update french translation 2017-02-13 15:23:45 +01:00
yflory
c838fdc667 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-13 13:06:38 +01:00
yflory
dc9ab7af4a Make the user confirm (french) 2017-02-13 13:06:32 +01:00
ansuz
5ae65c8bc1 make the user confirm 2017-02-13 13:04:55 +01:00
yflory
25dd103f6f Reduce font-size for register explanations 2017-02-13 12:54:34 +01:00
yflory
f93e121763 Translate register explanations in French 2017-02-13 12:54:03 +01:00
ansuz
7d0c29513c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-13 12:42:17 +01:00
ansuz
7d21206cae add registration introductory text 2017-02-13 12:42:07 +01:00
yflory
2807ad9dc3 Add spinner and translate the register page 2017-02-13 11:41:48 +01:00
yflory
bff9d05210 Make sure the login_name is in the object 2017-02-13 11:15:30 +01:00
yflory
3aa03225c9 Add a spinner when hashing the password and translate homepage 2017-02-13 11:09:30 +01:00