Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 9b8866ed72 handle RPC_NOT_READY error for logged out users ansuz 2017-06-29 11:10:07 +02:00
• a9f8f42e3c use minified less compiler ansuz 2017-06-29 10:50:21 +02:00
• fca1ef4d36 hide unstyled content until the loading screen is displayed ansuz 2017-06-29 10:49:35 +02:00
• 877c5a8d0e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-06-28 17:15:42 +02:00
• 19ff8a345d Avatar upload in the profile app yflory 2017-06-28 16:59:35 +02:00
• c53ebe3598 bring upload status container to the front ansuz 2017-06-28 16:33:00 +02:00
• 5e56ad912e remove the last bit of compiled css ansuz 2017-06-28 14:51:49 +02:00
• 7a7307d560 fix logging when resetting ansuz 2017-06-28 12:08:16 +02:00
• 1046a8e302 Merge pull request #141 from MacLemon/reduce-image-asset-size ansuz 2017-06-28 11:40:24 +02:00
• 9d83214158 forbid cache poisoning via botched reset calls ansuz 2017-06-28 11:36:34 +02:00
• 7439bbaba2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-06-28 10:58:24 +02:00
• 6c94605b9b File upload in the profile yflory 2017-06-28 10:59:29 +02:00
• ed45814020 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-06-28 10:57:49 +02:00
• cfc5907237 remove unnecessary style rules ansuz 2017-06-28 10:41:08 +02:00
• 85d8eda847 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-06-27 18:58:26 +02:00
• 176e47f394 Add the profile app yflory 2017-06-27 18:58:20 +02:00
• 1c1869a22c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-06-27 18:26:10 +02:00
• 7de2683169 make all apps use clientside templates ansuz 2017-06-27 18:17:52 +02:00
• f232675cc9 create a favicon if it does not already exist ansuz 2017-06-27 18:07:03 +02:00
• 3be6433fdf send feedback on name changes ansuz 2017-06-27 18:06:32 +02:00
• bdca6b10c2 use templates in poll.js ansuz 2017-06-27 15:38:12 +02:00
• bb74935b08 allow pin limit caching to occur at api level ansuz 2017-06-27 15:37:42 +02:00
• 00a554ca0d Fix the donate button style with the new toolbar yflory 2017-06-27 14:36:49 +02:00
• 3a9b480e4e resolve merge conflicts in template.js ansuz 2017-06-27 14:28:28 +02:00
• b2003b32c9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-06-27 14:28:11 +02:00
• 40f4fc2682 Add the profile app in template.js yflory 2017-06-27 14:27:54 +02:00
• 9b6790534f remove grey text from ckeditor initialState ansuz 2017-06-27 14:26:09 +02:00
• e9bfaa9a60 compile less clientside. remove compiled css ansuz 2017-06-27 14:25:02 +02:00
• 67a096a8a4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-06-27 09:57:32 +02:00
• 7b37146034 don't let spacebar keyups propagate outside of the title ansuz 2017-06-26 18:32:29 +02:00
• 9195c0cd12 is isOverPinLimit in toolbar ansuz 2017-06-26 18:13:06 +02:00
• fce0a37f50 cache pin data once retrieved from the server ansuz 2017-06-26 17:32:31 +02:00
• 8f2db44793 Remove getTitle from the file app yflory 2017-06-26 16:38:59 +02:00
• 33ea8cb183 Make sure we don't call both the yes and no handlers in prompts yflory 2017-06-26 16:23:55 +02:00
• c431041e3f Fix position of the rightside drawer with small screen yflory 2017-06-26 15:53:29 +02:00
• 3076ade23a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-06-26 15:16:45 +02:00
• 36ef4178dc Remove the editable title from the file app yflory 2017-06-26 15:16:17 +02:00
• 51e06e68a7 don't change slides when navigating through history ansuz 2017-06-26 14:40:48 +02:00
• ffcbde4325 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-06-26 14:32:42 +02:00
• 48ece55ed5 style fixes, and dynamic less compilation ansuz 2017-06-26 14:32:37 +02:00
• 38f568635d Fix duplicate media-tag in slides when adding or removing a slide yflory 2017-06-26 14:08:14 +02:00
• c364803406 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-06-26 11:25:06 +02:00
• 805e604e53 Add missing icons yflory 2017-06-26 11:24:49 +02:00
• f181e8db60 correct parentheses ansuz 2017-06-26 10:45:27 +02:00
• f4fdb7040c Optimize image assets to speedup page loading MacLemon 2017-06-25 20:14:23 +02:00
• 6af4335ead Translated up to page 317 Gustavo H M Silva 2017-06-23 14:28:00 -03:00
• ce44a8d351 Fix the backup button in anonymous drive yflory 2017-06-23 18:02:36 +02:00
• 06a0590f73 New folder icons yflory 2017-06-23 17:58:41 +02:00
• cc341ca6d4 Lint error yflory 2017-06-23 17:57:29 +02:00
• 0d4d104e08 Mobile support for the new toolbar yflory 2017-06-23 17:56:14 +02:00
• b4b851959f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-06-22 17:42:32 +02:00
• 61a891267f more feedback ansuz 2017-06-22 17:42:24 +02:00
• c1d2fa6b52 Unhack validateKey for the history mode yflory 2017-06-22 17:35:54 +02:00
• 90cc3e6a5e New userlist in the whiteboard app yflory 2017-06-22 17:16:42 +02:00
• 2710279904 Use the new share button in the file app yflory 2017-06-22 17:03:51 +02:00
• 5a48cba999 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-06-22 16:15:08 +02:00
• 684269fdda Userlist in polls yflory 2017-06-22 16:14:54 +02:00
• bd1db735dd jshint compliance ansuz 2017-06-22 16:02:20 +02:00
• 35bfa1dce4 test client-side templates in whiteboard app ansuz 2017-06-22 16:01:33 +02:00
• a11befaa0f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-06-22 15:52:31 +02:00
• 13288ee18b Update the userlist in code, slide and pad yflory 2017-06-22 15:52:25 +02:00
• 852c028822 don't allow editing if pad type is wrong ansuz 2017-06-22 14:31:55 +02:00
• dcfc59c2e2 Translation key updated yflory 2017-06-22 11:21:37 +02:00
• eddfb936f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-06-22 11:12:51 +02:00
• 92b6e60573 Small improvements for the new toolbar yflory 2017-06-22 11:13:53 +02:00
• 115813c191 Merge branch 'new-templates' into staging ansuz 2017-06-22 11:11:32 +02:00
• 3657e978fd give main2.js a more sensible name ansuz 2017-06-22 11:06:11 +02:00
• e86ef209a8 define loading screen markup in js ansuz 2017-06-22 11:04:21 +02:00
• 118b83c420 make register and login user clientside templates ansuz 2017-06-22 10:04:46 +02:00
• ab54dcf84d make libs pass jshint ansuz 2017-06-22 10:03:58 +02:00
• 6dacbf2bd9 add translations and some improvements Gogs 2017-06-21 21:38:56 +02:00
• 8d956c3de6 New toolbar yflory 2017-06-21 18:04:35 +02:00
• 48f9745619 clientside templating ansuz 2017-06-21 18:02:38 +02:00
• 503e9de07c Lint errors yflory 2017-06-20 18:00:57 +02:00
• b7a0547b77 New toolbar colors yflory 2017-06-20 17:59:11 +02:00
• fe6a9e5d8d Update bower.json yflory 2017-06-20 14:59:08 +02:00
• 3052ec8abb Merge branch 'newCk' into staging yflory 2017-06-20 14:57:19 +02:00
• c3f636851a Fix path size width in drive yflory 2017-06-20 14:56:15 +02:00
• c22f610d5c Fix the drive integrity check yflory 2017-06-20 12:59:44 +02:00
• fb388f2610 Fix an issue with invalid drive before migration yflory 2017-06-20 12:42:30 +02:00
• 59fb5bd8be One toolbar color per app yflory 2017-06-20 12:33:50 +02:00
• 5a248db267 Merge branch 'staging' into newCk yflory 2017-06-20 10:57:40 +02:00
• 728272d936 Fix undefined function yflory 2017-06-20 10:29:03 +02:00
• f13d23241c Upgrade CkEditor to version 4.7 yflory 2017-06-20 10:03:13 +02:00
• 9be23be5eb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-06-19 18:09:57 +02:00
• b80d7513aa skip over the terms of service link ansuz 2017-06-19 18:03:39 +02:00
• 1275f3f3a3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-06-19 17:59:18 +02:00
• f5da7ae42e Add a new loading tip in french yflory 2017-06-19 17:59:12 +02:00
• e2ff88e4c4 tooltips for file upload ansuz 2017-06-19 17:56:19 +02:00
• d822dfe37a add forget button to file app ansuz 2017-06-19 17:44:30 +02:00
• 7fd36a72f3 re-add download button for file app ansuz 2017-06-19 17:36:22 +02:00
• f02a381e32 avoid horizontal scrollbars ansuz 2017-06-19 16:30:03 +02:00
• cc5d5d4f1d make pdfs in file app big ansuz 2017-06-19 16:13:11 +02:00
• dbfad9d227 Lint yflory 2017-06-19 16:02:27 +02:00
• 91d46cdee4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-06-19 15:58:26 +02:00
• d3b9ac2511 Update the preview and present content on Ready in slides yflory 2017-06-19 15:58:10 +02:00
• 499087fd52 Merge pull request #137 from pbondoer/spanish ansuz 2017-06-19 15:37:06 +02:00
• 5fd4870b8b Merge pull request #138 from pbondoer/staging ansuz 2017-06-19 15:36:35 +02:00
• 626e54d7b5 Fix poll auto-focus inputs Pierre Bondoerffer 2017-06-19 15:30:22 +02:00
• 54adb680e7 Hide the slide number in the title outside of present mode yflory 2017-06-19 15:26:27 +02:00