dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,591 Commits 73 Branches 132 Tags 560 MiB
Commit Graph

1591 Commits

Author SHA1 Message Date
yflory e73b4a1131 Don't display 'All files' in the menu 2017-02-22 11:15:29 +01:00
ansuz 641c805518 unbreak ckeditor 2017-02-21 18:59:42 +01:00
ansuz 7e77c6828a more correct pluralization 2017-02-21 18:55:48 +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
yflory 328e5c6f03 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-21 17:43:05 +01:00
yflory c72bbd4c37 Use the file name as initial title 2017-02-21 17:42:58 +01:00
ansuz ed19c6885d join array in messages.js 2017-02-21 17:16:56 +01:00
ansuz 22f926d3a5 Merge pull request #87 from pbondoer/staging 
Assert translation now outputs an easy to edit diff
 2017-02-21 15:01:03 +01:00
Pierre Bondoerffer 4cbb3b2ed2
Ensure we use English for reference 2017-02-21 14:53:18 +01:00
Pierre Bondoerffer ffe17a6bc9
Use JSON.stringify instead and fix linter 2017-02-21 14:37:08 +01:00
Pierre Bondoerffer a84f8e2808
Assert translation now outputs JavaScript which is easier to edit for translators 2017-02-21 14:23:58 +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
ansuz 84b64da76d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-21 12:22:09 +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
ansuz 1151c02662 Merge branch 'master' of github.com:xwiki-labs/cryptpad into staging 2017-02-21 10:58:28 +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 2103f0afa8 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2017-02-21 10:42:35 +01:00
yflory 0bdf59c1dd Fix broken link in the 'New' button on cryptpad.fr 2017-02-21 10:42:06 +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 9702305abc Use better translation keys in settings 2017-02-17 17:38:59 +01:00
yflory a6497f7a52 Add a way to show the drive tips again 2017-02-17 16:56:59 +01:00
yflory c17f28e5fe Fix race condition #2 2017-02-17 15:39:34 +01:00
yflory 38122d7785 Merge branch 'soon' 2017-02-17 15:26:01 +01:00
yflory 239e2bcc1f Fix issue with null entries in Cryptpad_RECENTPADS 2017-02-17 15:18:09 +01:00
yflory 1540ae3f6f Fix issue with null entries in Cryptpad_RECENTPADS 2017-02-17 15:16:30 +01:00
yflory dd014f6ef2 Fix race conditon 2017-02-17 15:16:03 +01:00
ansuz 94417d9a8b jshint compliance 2017-02-17 14:28:18 +01:00
ansuz 8167ed9048 implement cache-busting everywhere 2017-02-17 12:39:01 +01:00
ansuz 34b6507fa3 implement cache-busting everywhere 2017-02-17 12:38:58 +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 2daa9f8658 Link to main page was opened in the inner iframe 2017-02-17 10:57:56 +01:00
yflory deda40375a Use the new onSettle from chainpad to determine if the realtime is synced 2017-02-17 10:31:07 +01:00
yflory c62e0f8be0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-16 18:11:28 +01:00