Commit graph

959 commits

Author SHA1 Message Date
ansuz
4a37bc4a1c abort the realtime session if it does not synchronize for 30 seconds 2017-07-10 10:34:25 +02:00
ansuz
1c462d5c4a use random token for feedback instead of date 2017-07-07 10:16:54 +02:00
yflory
8dc8aa27ab Lint 2017-07-05 12:27:40 +02:00
yflory
35e8c1a63b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-05 12:27:08 +02:00
yflory
43ac71603c Move pad attributes in pad data 2017-07-05 12:26:42 +02:00
ansuz
9f6ecea5d9 fix nacl reference error in media tag 2017-07-05 11:57:53 +02:00
yflory
69f4ce2abd Fix middle click on the drive button 2017-07-04 17:03:54 +02:00
ansuz
cbd9fc4076 Merge branch 'staging' 2017-07-04 17:03:20 +02:00
ansuz
3fe0baa956 disable pin limit caching 2017-07-04 15:50:52 +02:00
ansuz
9c1eaf9c1a lint compliance 2017-07-04 15:48:20 +02:00
yflory
cab595f959 Fix duplicate folders in the drive 2017-07-04 14:51:35 +02:00
ansuz
ac8da0d52d load codemirror in the correct context. fix selection events 2017-07-04 12:37:24 +02:00
ansuz
43b877ad27 fix styling on media tag download button 2017-07-04 10:28:50 +02:00
ansuz
1fd0ba488a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-04 10:21:35 +02:00
ansuz
04a28433ae replace inner content of media tag download buttons 2017-07-04 10:21:29 +02:00
ansuz
f85af7ef4c hide useless messages 2017-07-04 10:19:18 +02:00
ansuz
a59853f9c2 use new media tag 2017-07-04 10:15:45 +02:00
yflory
8cf694bea6 Lint 2017-07-03 18:41:41 +02:00
yflory
47c6c64b8a Allow emojis in default avatars 2017-07-03 18:37:50 +02:00
yflory
ffd184d50e Fix overflowing names in the new userlist 2017-07-03 17:41:34 +02:00
ansuz
92d88d1644 don't change allowed media types until we have media-tag scoping 2017-07-03 16:45:40 +02:00
yflory
fa2d857d70 Fix css issues with Safari 2017-07-03 16:11:41 +02:00
yflory
81c8949aee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-03 14:43:17 +02:00
ansuz
8b0210baf1 hide useless error 2017-07-03 12:26:34 +02:00
yflory
991cb896bd Fix avatar in /pad 2017-07-03 12:25:05 +02:00
ansuz
6ac056e314 make explicit file size RPCs unauthenticated 2017-07-03 11:38:39 +02:00
yflory
5694505719 Fix syntax highlighting 2017-07-03 11:16:28 +02:00
yflory
335898a4c7 Hack the drawer to close it when clicking outside 2017-06-30 18:23:23 +02:00
yflory
472a62730b Fix profile creation and add a link to the profile app 2017-06-30 17:24:22 +02:00
yflory
b153dda6ff Add avatars in the user list 2017-06-30 16:57:23 +02:00
yflory
555d0a09f8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-30 12:36:34 +02:00
yflory
568ce70afd Add a spinner for the history and update history buttons 2017-06-30 12:36:21 +02:00
Caleb James DeLisle
2144587919 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-30 12:11:55 +02:00
Caleb James DeLisle
c25f2df721 Added caching versions to some of the images which are loaded by js 2017-06-30 12:11:44 +02:00
yflory
7e69d051c4 Lint errors 2017-06-30 11:46:20 +02:00
yflory
26193aeaa7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-30 11:42:59 +02:00
yflory
b9320e6005 Toolbar improvements 2017-06-30 11:42:54 +02:00
ansuz
75c2a1fd73 jshint compliance 2017-06-30 11:20:56 +02:00
ansuz
b8934c0b97 smarter redraws of drive/settings usage bar 2017-06-30 11:20:40 +02:00
yflory
cc5b7615ad Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-29 18:05:49 +02:00
yflory
ed0121d172 Lint errors 2017-06-29 18:05:34 +02:00
ansuz
b7cb1a8d5f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-29 17:54:29 +02:00
yflory
8279ef3130 Fix conflict between ckeditor toolbar and userlist on small screens 2017-06-29 17:51:30 +02:00
ansuz
b037cfbfdb set usage tips relative to bottom of screen, not top 2017-06-29 17:25:06 +02:00
ansuz
1763cf72d1 tell anonymous users they can't upload 2017-06-29 16:28:58 +02:00
yflory
7a87775372 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-29 15:21:09 +02:00
ansuz
45f180955b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-29 15:20:46 +02:00
yflory
56a25e1036 Small fixes for the new toolbar 2017-06-29 15:15:40 +02:00
ansuz
1179992a90 update feedback key name 2017-06-29 14:48:33 +02:00
ansuz
39149a052b add new feedback keys 2017-06-29 14:16:20 +02:00