Commit Graph

500 Commits (6098f28260a56563cd20fb472c10429eebb1583b)

Author SHA1 Message Date
Pierre Bondoerffer 800db07077
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 2017-03-02 17:44:29 +01:00
Pierre Bondoerffer e39fe1c0b7
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 2017-03-02 17:09:39 +01:00
ansuz 01c4d7d4a7 Merge branch 'maybe' into staging 2017-03-02 17:09:06 +01:00
ansuz c884782d57 here are some changes 2017-03-02 17:08:50 +01:00
yflory 2b6e44189d When trying to reset the drive, tell the user if the input text is invalid 2017-03-02 17:01:27 +01:00
Pierre Bondoerffer e8a82c4c10
(CSS) Toolbar buttons are now always black on white independent of system theme 2017-03-02 16:35:30 +01:00
Pierre Bondoerffer fa59f1000e
(CSS) Fix title input in pads 2017-03-02 16:33:17 +01:00
yflory 2b20eef464 Fix userlist in /pad 2017-03-02 12:28:01 +01:00
ansuz e3f26263f4 remove red outline on images in slide 2017-03-02 11:28:20 +01:00
ansuz c9040997d5 Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2 2017-03-02 11:07:17 +01:00
yflory 8bdc8415ab Find a pad in the drive 2017-03-02 10:15:13 +01:00
Caleb James DeLisle 91eda5fa83 Implement stronger content-security-policy except in /pad/ which does not allow it.
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
2017-03-01 21:06:53 +01:00
ansuz 9800f036c5 fix a typo 2017-03-01 17:06:18 +01:00
ansuz 84a4a15c46 fix inverted checkbox description 2017-02-28 18:58:20 +01:00
Pierre Bondoerffer f11b03c16e
Spanish translation updated 🎉 2017-02-28 18:47:58 +01:00
yflory f130fd0598 Fix horizontal scrollbar in edge 2017-02-28 18:02:12 +01:00
yflory 345d2faab2 Fix horizontal scrollbar in Edge #3 2017-02-28 17:13:51 +01:00
yflory d683dc499a Fix horizontal scrollbar in Edge #2 2017-02-28 17:03:23 +01:00
yflory 7a0a87bf6c Fix horizontal scrollbar in Edge 2017-02-28 16:38:51 +01:00
ansuz 3bf85b113c don't hide overflow, that causes worse problems 2017-02-28 16:37:34 +01:00
yflory 65202bd619 Fix french translation with the drive readme 2017-02-28 15:02:11 +01:00
ansuz 3380b13c95 remove horizontal scroll on edge 2017-02-28 12:29:53 +01:00
ansuz 10c41369de Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-28 12:25:40 +01:00
ansuz 8c87255267 remove any mention of piwik 2017-02-28 12:25:31 +01:00
yflory 8007f51655 Update french translation 2017-02-28 12:01:32 +01:00
yflory 1c7561f37e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-28 11:51:23 +01:00
yflory 6967b67485 Update french translation suing new best practices 2017-02-28 11:51:18 +01:00
ansuz 569d25f25f update some translation keys in English 2017-02-28 11:50:07 +01:00
ansuz b87c9d4ba6 fix merge conflicts with usability branch 2017-02-28 11:35:29 +01:00
ansuz 5a49e276b5 add settings_anonymous key 2017-02-28 11:32:14 +01:00
yflory 4f4075ed6e Make the settings app available to anonymous users 2017-02-28 11:23:50 +01:00
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
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
ansuz 20689b1dec update english translation for usability feedback 2017-02-23 16:11:39 +01:00
yflory 2d30393243 Add support for updated translation key 2017-02-23 11:45:00 +01:00