Commit Graph

1866 Commits (cd77f5071755bceec89ea956a7d204140c578565)

Author SHA1 Message Date
yflory 42b6cca18d Fix new pad not working 2017-02-24 16:55:43 +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 02cc9c8344 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-24 16:18:54 +01:00
yflory e040c00557 Fix blocker issue when creating an account without migrating 2017-02-24 16:18:41 +01:00
yflory e15a6a347f Fix the forget pad button 2017-02-24 15:22:26 +01:00
ansuz 89bee8cf6b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-24 12:08:26 +01:00
ansuz ba3e24b595 media tag experiments 2017-02-24 12:08:16 +01:00
ansuz 9ccb473b46 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into usability 2017-02-24 12:06:17 +01:00
ansuz 252fc7a640 uppercase messages 2017-02-24 11:52:21 +01:00
yflory 54b0a86c2e Make sure we redirect to the drive if we access the login page from the homepage 2017-02-24 11:44:47 +01:00
yflory 55fb0f03ae Fix the path in the drive overriding the content area 2017-02-24 11:01:33 +01:00
yflory d7d7165dc4 Login page was using a wrong translation key 2017-02-23 18:19:33 +01:00
yflory ba0b314f5e Fix the 'new' button in drive which was broken in non root categories 2017-02-23 18:15:44 +01:00
yflory d8cc2903cc Display context menu actions in the toolbar when an element is selected 2017-02-23 17:25:25 +01:00
ansuz 20689b1dec update english translation for usability feedback 2017-02-23 16:11:39 +01:00
yflory a0340f1419 Open link in a new tab in /pad 2017-02-23 14:27:18 +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 cc174f3bee Fix typo 2017-02-22 12:26:25 +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 89f3577058 remove old poll 2017-02-22 11:05:47 +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