Commit graph

2042 commits

Author SHA1 Message Date
yflory
7b27f1dc2c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-16 14:16:54 +01:00
yflory
7761aaa89f Add search UI 2017-03-16 14:16:42 +01:00
ansuz
ac08c9f3d9 rpc should only respond to signed messages 2017-03-16 13:07:42 +01:00
ansuz
d585fce67b suppress RPC errors if configured to do so 2017-03-16 13:07:01 +01:00
ansuz
b578803136 clean up registration code a little bit 2017-03-16 10:37:16 +01:00
ansuz
c3c866fa2b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-15 18:59:53 +01:00
yflory
d19bbcb001 Add support for search in the drive 2017-03-15 18:59:55 +01:00
ansuz
5eb32b33ee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-15 18:59:38 +01:00
ansuz
298725b3c2 don't show usage tips on error screens 2017-03-15 18:58:39 +01:00
ansuz
0a6373852e add signing keys to user object at login and register time 2017-03-15 18:57:13 +01:00
yflory
9a32fb1999 Fix sub-folders changing position in the tree when renaming them 2017-03-15 17:34:06 +01:00
yflory
931f7619c0 Keep the scroll position on redraw in drive 2017-03-15 17:30:52 +01:00
yflory
0607c3bbf3 Add a title to the 'new' button in drive 2017-03-15 17:20:08 +01:00
yflory
b9c64a526a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-15 17:15:03 +01:00
yflory
15e9af77bb Remove the langauge selector from toolbar and add it in settings 2017-03-15 17:14:49 +01:00
ansuz
8129b8cdc1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-15 16:05:05 +01:00
ansuz
15a67afc75 jshint compliance 2017-03-15 16:04:52 +01:00
yflory
13d7b3cadc Merge branch 'd' into staging 2017-03-15 16:01:29 +01:00
yflory
a286599f93 Fix fast reconnect, and add support for reconnecting ws in polls 2017-03-15 16:01:00 +01:00
ansuz
bd9efd7c04 provide examples of valid and invalid rpc calls 2017-03-15 15:56:32 +01:00
ansuz
7187d3c550 implement getUserChannelList 2017-03-15 15:55:55 +01:00
ansuz
61fc4a3f86 respond to GET_FILE_SIZE rpc calls 2017-03-15 15:55:25 +01:00
ansuz
d0466a2052 implement 'getChannelSize' api in storage 2017-03-15 15:51:03 +01:00
yflory
66ff6ae1b0 Fast reconnect 2017-03-14 18:05:57 +01:00
ansuz
306f6ce806 resolve merge-conflict with accounting branch 2017-03-14 15:52:04 +01:00
yflory
eb1924acb9 Merge branch 'soon' 2017-03-14 15:44:12 +01:00
yflory
fe5e33a0ee Fix loss of presentation position when updating slides 2017-03-14 15:42:42 +01:00
ansuz
9818c562fb Merge branch 'soon' 2017-03-14 14:45:18 +01:00
ansuz
c864e213ec bump version number 2017-03-14 14:35:44 +01:00
ansuz
dcc4e0dc6b remove extraneous translation 2017-03-14 14:35:27 +01:00
ansuz
805e26bc07 add a version footer to main pages 2017-03-14 14:34:13 +01:00
yflory
f10149db1c Make sure the tip is always visible when the loading screen is removed 2017-03-14 12:49:22 +01:00
yflory
bc35fc86cf Translate the 'alreadyRegistered' error in french 2017-03-14 12:42:00 +01:00
ansuz
71db08eac2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-14 12:40:25 +01:00
ansuz
fcbe3a5224 add already registered message to english translation 2017-03-14 12:40:19 +01:00
ansuz
09afba80db add support for logging in from register page 2017-03-14 12:39:50 +01:00
yflory
16e5788011 Call the callback if we can't parse the local Drive to import it 2017-03-14 12:09:52 +01:00
yflory
36a2eab3c3 Add French translation for the new register process 2017-03-14 12:05:12 +01:00
ansuz
11ff3f5347 new styles for alertify dialogs 2017-03-14 12:02:12 +01:00
ansuz
413d9a6f0b add a style-callback to confirm 2017-03-14 12:01:42 +01:00
ansuz
5d88c3a436 newer registration code 2017-03-14 12:00:23 +01:00
ansuz
bbe2279b9c add new translations for registration 2017-03-14 11:02:14 +01:00
ansuz
10bb11bff6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-13 19:32:15 +01:00
ansuz
0d30a1e00f add safe and danger classes to alertify styles 2017-03-13 19:32:10 +01:00
ansuz
803e57c958 add more parameters to confirm dialogs 2017-03-13 19:30:56 +01:00
yflory
ceaf757680 Allow right click on the CryptPad logo/link in the top left corner 2017-03-13 18:49:30 +01:00
ansuz
f2aa531f27 apply styles to confirm buttons if provided 2017-03-13 18:18:38 +01:00
ansuz
df6298eeb6 apply styles to confirm buttons if provided 2017-03-13 18:18:17 +01:00
ansuz
bebd40f901 add a todo 2017-03-13 18:16:17 +01:00
ansuz
1cc6eab871 Merge pull request #98 from pbondoer/staging
Spanish update 🇪🇸
2017-03-13 16:36:56 +01:00