Commit graph

2843 commits

Author SHA1 Message Date
yflory
b9320e6005 Toolbar improvements 2017-06-30 11:42:54 +02:00
yflory
5a3e9c785c Fix ckeditor toolbar 2017-06-29 18:15:41 +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
yflory
8abc94d37b Replace folder images in the drive 2017-06-29 18:03:19 +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
0b9d7d6c0b fix color of links in poll and whiteboard 2017-06-29 16:51:44 +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
4a5f5de78c restore missing stylesheet for poll 2017-06-29 14:35:23 +02:00
ansuz
bbf9916a91 fixes for file app 2017-06-29 14:21:48 +02:00
ansuz
39149a052b add new feedback keys 2017-06-29 14:16:20 +02:00
ansuz
7a5c5ce0a3 load scripts asynchronously 2017-06-29 12:17:08 +02:00
ansuz
9b8866ed72 handle RPC_NOT_READY error for logged out users 2017-06-29 11:13:48 +02:00
ansuz
a9f8f42e3c use minified less compiler 2017-06-29 10:50:21 +02:00
ansuz
fca1ef4d36 hide unstyled content until the loading screen is displayed 2017-06-29 10:49:35 +02:00
yflory
877c5a8d0e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-28 17:15:42 +02:00
yflory
19ff8a345d Avatar upload in the profile app 2017-06-28 16:59:35 +02:00
ansuz
c53ebe3598 bring upload status container to the front 2017-06-28 16:33:00 +02:00
ansuz
5e56ad912e remove the last bit of compiled css 2017-06-28 14:51:49 +02:00
ansuz
7a7307d560 fix logging when resetting 2017-06-28 12:08:16 +02:00
ansuz
9d83214158 forbid cache poisoning via botched reset calls 2017-06-28 11:36:34 +02:00
yflory
6c94605b9b File upload in the profile 2017-06-28 10:59:29 +02:00
ansuz
7439bbaba2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-28 10:58:24 +02:00
ansuz
ed45814020 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-28 10:57:49 +02:00
ansuz
cfc5907237 remove unnecessary style rules 2017-06-28 10:41:08 +02:00
yflory
85d8eda847 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-27 18:58:26 +02:00
yflory
176e47f394 Add the profile app 2017-06-27 18:58:20 +02:00
ansuz
1c1869a22c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-27 18:26:10 +02:00
ansuz
7de2683169 make all apps use clientside templates 2017-06-27 18:17:52 +02:00
ansuz
f232675cc9 create a favicon if it does not already exist 2017-06-27 18:07:03 +02:00
ansuz
3be6433fdf send feedback on name changes 2017-06-27 18:06:32 +02:00
ansuz
bdca6b10c2 use templates in poll.js 2017-06-27 15:38:12 +02:00
ansuz
bb74935b08 allow pin limit caching to occur at api level 2017-06-27 15:37:42 +02:00
yflory
00a554ca0d Fix the donate button style with the new toolbar 2017-06-27 14:36:49 +02:00
ansuz
3a9b480e4e resolve merge conflicts in template.js 2017-06-27 14:28:28 +02:00
yflory
b2003b32c9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-27 14:28:11 +02:00
yflory
40f4fc2682 Add the profile app in template.js 2017-06-27 14:27:54 +02:00
ansuz
9b6790534f remove grey text from ckeditor initialState 2017-06-27 14:26:09 +02:00
ansuz
e9bfaa9a60 compile less clientside. remove compiled css 2017-06-27 14:25:02 +02:00
ansuz
67a096a8a4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-27 09:57:32 +02:00
ansuz
7b37146034 don't let spacebar keyups propagate outside of the title 2017-06-26 18:32:29 +02:00
ansuz
9195c0cd12 is isOverPinLimit in toolbar 2017-06-26 18:13:06 +02:00
ansuz
fce0a37f50 cache pin data once retrieved from the server 2017-06-26 17:32:31 +02:00
yflory
8f2db44793 Remove getTitle from the file app 2017-06-26 16:38:59 +02:00