Commit Graph

3075 Commits (128d5b2c6d7ce1a07334fafe8775457775b10ad1)

Author SHA1 Message Date
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 1046a8e302 Merge pull request #141 from MacLemon/reduce-image-asset-size
Optimize image assets to speedup page loading
2017-06-28 11:40:24 +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
yflory 33ea8cb183 Make sure we don't call both the yes and no handlers in prompts 2017-06-26 16:23:55 +02:00
yflory c431041e3f Fix position of the rightside drawer with small screen 2017-06-26 15:53:29 +02:00
yflory 3076ade23a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-26 15:16:45 +02:00
yflory 36ef4178dc Remove the editable title from the file app 2017-06-26 15:16:17 +02:00
ansuz 51e06e68a7 don't change slides when navigating through history 2017-06-26 14:40:48 +02:00
ansuz ffcbde4325 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-26 14:32:42 +02:00
ansuz 48ece55ed5 style fixes, and dynamic less compilation 2017-06-26 14:32:37 +02:00
yflory 38f568635d Fix duplicate media-tag in slides when adding or removing a slide 2017-06-26 14:08:14 +02:00
yflory c364803406 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-26 11:25:06 +02:00
yflory 805e604e53 Add missing icons 2017-06-26 11:24:49 +02:00
ansuz f181e8db60 correct parentheses 2017-06-26 10:45:27 +02:00
MacLemon f4fdb7040c Optimize image assets to speedup page loading 2017-06-25 20:14:23 +02:00
yflory ce44a8d351 Fix the backup button in anonymous drive 2017-06-23 18:02:36 +02:00
yflory 06a0590f73 New folder icons 2017-06-23 17:58:41 +02:00
yflory cc341ca6d4 Lint error 2017-06-23 17:57:29 +02:00
yflory 0d4d104e08 Mobile support for the new toolbar 2017-06-23 17:56:14 +02:00
ansuz b4b851959f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-22 17:42:32 +02:00
ansuz 61a891267f more feedback 2017-06-22 17:42:24 +02:00
yflory c1d2fa6b52 Unhack validateKey for the history mode 2017-06-22 17:35:54 +02:00