Commit Graph

466 Commits (12aec60a12ff5287845723d249a3125539504404)

Author SHA1 Message Date
ansuz 69b6f80e4b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-28 10:47:23 +01:00
ansuz 86adfbf27d update cache-busting directive in all supported apps 2017-02-28 10:47:18 +01:00
yflory 96f6b5755d Add the blog link in the header and footer 2017-02-28 10:39:48 +01:00
yflory ccd195d318 Translate user feedback keys in french 2017-02-28 10:28:07 +01:00
ansuz 9a2ed5741a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-27 20:11:26 +01:00
ansuz a4913f2f4b provide UI for disabling the user feedback api 2017-02-27 20:11:18 +01:00
yflory 20518a3e88 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-27 17:23:40 +01:00
yflory f8d653406a Add the new content for the default pad and add french translation 2017-02-27 17:23:28 +01:00
ansuz d15a08830e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-27 14:32:04 +01:00
ansuz 06f0891d21 add allowUserFeedback toggle to settigs page 2017-02-27 14:31:56 +01:00
ansuz 4941674cf7 initialize allowUserFeedback to true if it is not defined 2017-02-27 14:31:00 +01:00
yflory 95853debf9 Update the default pad #1 2017-02-27 14:29:48 +01:00
yflory 38893fb8e5 Remove the 'Bootstart tooltips require Tether' error 2017-02-27 11:19:29 +01:00
yflory 3fd5669647 Hide the trash icon for read-only pads if we have the edit link in drive 2017-02-24 16:51:15 +01:00
yflory e15a6a347f Fix the forget pad button 2017-02-24 15:22:26 +01:00
yflory 2d30393243 Add support for updated translation key 2017-02-23 11:45:00 +01:00
ansuz f168433db0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-22 17:41:06 +01:00
ansuz d0b7576d84 make slide present mode exit button clickable at all sizes 2017-02-22 17:40:44 +01:00
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