Commit Graph

1137 Commits

Author SHA1 Message Date
yflory 412815b042 Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security 2017-03-01 13:10:55 +01:00
yflory 11d54256da Make sure the display name is displayed in the same way everywhere 2017-03-01 13:10:06 +01:00
yflory 2c5c6da0d9 Fix XSS in alertify logs 2017-03-01 13:09:14 +01:00
yflory 5797aab3f2 Fix XSS with display names in the user list 2017-03-01 13:08:36 +01:00
yflory 26e3971482 Fix XSS in the user dropdown menu 2017-03-01 13:08:09 +01:00
ansuz 639376f1cb don't use hyperjson.toString 2017-03-01 12:36:10 +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
yflory f06196c261 Remove the context menu buttons when removing selection 2017-02-28 15:48:49 +01:00
yflory c0278ba77f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-28 13:12:53 +01:00
yflory efb7380a12 Fix default pad not created after registration 2017-02-28 13:12:27 +01:00
ansuz 5d39125004 Make onSettle Async Again 2017-02-28 13:12:04 +01:00
yflory 4f4075ed6e Make the settings app available to anonymous users 2017-02-28 11:23:50 +01:00
yflory 0224d6489b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-28 11:06:50 +01:00
ansuz 12aec60a12 hack around onSettle not doing its job 2017-02-28 11:05:59 +01:00
yflory 0ae7f94184 Remove the pointer and text underline on icon:hover in drive 2017-02-28 10:50:52 +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
ansuz cfc9f2e622 remove code for 'user' app, now that we have login and register 2017-02-28 10:46:21 +01:00
yflory ec7761eeb8 Make sure we don't use a wrong title for a new pad 2017-02-28 10:43:36 +01:00
yflory 8e7e1d336e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-28 10:39:53 +01:00
yflory 96f6b5755d Add the blog link in the header and footer 2017-02-28 10:39:48 +01:00
ansuz d49a7d7ec4 fix undefined reference 2017-02-28 10:30:24 +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
ansuz 1a259bb3aa check if user has disallowed feedback api 2017-02-27 20:02:54 +01:00
yflory 4f7a05ead2 Fix issue with the path for the trash in the drive's topbar 2017-02-27 18:37:44 +01:00
yflory 8741b50f5b Set the file name as default title if a pad is created from the drive 2017-02-27 18:15:18 +01:00
yflory e8c73f35ce In the tree, display the rename input only once 2017-02-27 17:50:58 +01:00
yflory e38df7ce47 Fix creation of new pads in /pad 2017-02-27 17:47:11 +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
yflory 498f4065cf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-27 14:29:55 +01:00
yflory 95853debf9 Update the default pad #1 2017-02-27 14:29:48 +01:00
yflory d4bf7cf9aa Send the initial state only if it is a new pad in /pad 2017-02-27 14:29:38 +01:00
yflory 66dc166936 Make sure the realtime is synced with onSettle when using cryptget 2017-02-27 14:28:12 +01:00
yflory fadddb297c Readonly mode in /pad had contenteditable set to true 2017-02-27 12:41:29 +01:00
ansuz de5a21fe57 add a simple feedback api and text explaining what it is 2017-02-27 12:06:49 +01:00
yflory 2ad9debe58 Remove the placeholders in /code and /slide 2017-02-27 11:45:23 +01:00
yflory 38893fb8e5 Remove the 'Bootstart tooltips require Tether' error 2017-02-27 11:19:29 +01:00
yflory 88b29e8bdd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-24 18:55:48 +01:00
yflory 5303e76ece Make sure the content is correctly applied in onReady 2017-02-24 18:55:41 +01:00
ansuz cc829d51f8 jshint compliance 2017-02-24 18:23:43 +01:00
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