Commit graph

1982 commits

Author SHA1 Message Date
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
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
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
yflory
90cc3e6a5e New userlist in the whiteboard app 2017-06-22 17:16:42 +02:00
yflory
2710279904 Use the new share button in the file app 2017-06-22 17:03:51 +02:00
yflory
5a48cba999 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-22 16:15:08 +02:00
yflory
684269fdda Userlist in polls 2017-06-22 16:14:54 +02:00
ansuz
35bfa1dce4 test client-side templates in whiteboard app 2017-06-22 16:01:33 +02:00
yflory
a11befaa0f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-22 15:52:31 +02:00
yflory
13288ee18b Update the userlist in code, slide and pad 2017-06-22 15:52:25 +02:00
ansuz
852c028822 don't allow editing if pad type is wrong 2017-06-22 14:31:55 +02:00
yflory
92b6e60573 Small improvements for the new toolbar 2017-06-22 11:13:53 +02:00
ansuz
eddfb936f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-22 11:12:51 +02:00
ansuz
115813c191 Merge branch 'new-templates' into staging 2017-06-22 11:11:32 +02:00
ansuz
3657e978fd give main2.js a more sensible name 2017-06-22 11:06:11 +02:00
ansuz
118b83c420 make register and login user clientside templates 2017-06-22 10:04:46 +02:00
ansuz
ab54dcf84d make libs pass jshint 2017-06-22 10:03:58 +02:00
yflory
8d956c3de6 New toolbar 2017-06-21 18:04:35 +02:00
ansuz
48f9745619 clientside templating 2017-06-21 18:02:38 +02:00
yflory
503e9de07c Lint errors 2017-06-20 18:00:57 +02:00
yflory
b7a0547b77 New toolbar colors 2017-06-20 17:59:11 +02:00
yflory
3052ec8abb Merge branch 'newCk' into staging 2017-06-20 14:57:19 +02:00
yflory
c3f636851a Fix path size width in drive 2017-06-20 14:56:15 +02:00
yflory
c22f610d5c Fix the drive integrity check 2017-06-20 12:59:44 +02:00
yflory
fb388f2610 Fix an issue with invalid drive before migration 2017-06-20 12:42:30 +02:00
yflory
59fb5bd8be One toolbar color per app 2017-06-20 12:33:50 +02:00
yflory
5a248db267 Merge branch 'staging' into newCk 2017-06-20 10:57:40 +02:00
yflory
728272d936 Fix undefined function 2017-06-20 10:29:03 +02:00
yflory
f13d23241c Upgrade CkEditor to version 4.7 2017-06-20 10:03:13 +02:00
ansuz
d822dfe37a add forget button to file app 2017-06-19 17:44:30 +02:00
ansuz
7fd36a72f3 re-add download button for file app 2017-06-19 17:36:22 +02:00
ansuz
f02a381e32 avoid horizontal scrollbars 2017-06-19 16:30:03 +02:00
ansuz
cc5d5d4f1d make pdfs in file app big 2017-06-19 16:13:11 +02:00
yflory
dbfad9d227 Lint 2017-06-19 16:02:27 +02:00