Commit graph

1741 commits

Author SHA1 Message Date
ansuz
d49a7d7ec4 fix undefined reference 2017-02-28 10:30:24 +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
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
ansuz
4941674cf7 initialize allowUserFeedback to true if it is not defined 2017-02-27 14:31:00 +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
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