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
|
dcfc59c2e2
|
Translation key updated
|
2017-06-22 11:21:37 +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
|
e86ef209a8
|
define loading screen markup in js
|
2017-06-22 11:04:21 +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
|
fe6a9e5d8d
|
Update bower.json
|
2017-06-20 14:59:08 +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
|
9be23be5eb
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-19 18:09:57 +02:00 |
|
ansuz
|
b80d7513aa
|
skip over the terms of service link
|
2017-06-19 18:03:39 +02:00 |
|
yflory
|
1275f3f3a3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-19 17:59:18 +02:00 |
|
yflory
|
f5da7ae42e
|
Add a new loading tip in french
|
2017-06-19 17:59:12 +02:00 |
|
ansuz
|
e2ff88e4c4
|
tooltips for file upload
|
2017-06-19 17:56:19 +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 |
|
yflory
|
91d46cdee4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-19 15:58:26 +02:00 |
|
yflory
|
d3b9ac2511
|
Update the preview and present content on Ready in slides
|
2017-06-19 15:58:10 +02:00 |
|
ansuz
|
499087fd52
|
Merge pull request #137 from pbondoer/spanish
Spanish update
|
2017-06-19 15:37:06 +02:00 |
|
ansuz
|
5fd4870b8b
|
Merge pull request #138 from pbondoer/staging
Fix poll auto-focus inputs
|
2017-06-19 15:36:35 +02:00 |
|
Pierre Bondoerffer
|
626e54d7b5
|
Fix poll auto-focus inputs
|
2017-06-19 15:30:22 +02:00 |
|
yflory
|
54adb680e7
|
Hide the slide number in the title outside of present mode
|
2017-06-19 15:26:27 +02:00 |
|
Pierre Bondoerffer
|
726302a9ee
|
Spanish update
|
2017-06-19 15:05:17 +02:00 |
|
ansuz
|
17838f1d70
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-19 14:55:45 +02:00 |
|
ansuz
|
1b66383bac
|
don't create color-picker if readonly
|
2017-06-19 14:55:34 +02:00 |
|
yflory
|
a38819f5b9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-19 14:41:38 +02:00 |
|
yflory
|
1ad1b78c64
|
Fix the history mode with readOnly and old URLs
|
2017-06-19 14:41:31 +02:00 |
|
ansuz
|
b2a70f86d3
|
disallow concurrent logins
|
2017-06-19 14:22:21 +02:00 |
|
ansuz
|
35e0de463b
|
disallow concurrent scrypt cycles
|
2017-06-19 14:18:10 +02:00 |
|
ansuz
|
06ca70d11e
|
lint compliance
|
2017-06-19 14:05:40 +02:00 |
|
ansuz
|
f29f430e7c
|
better handling of non-rpc messages
|
2017-06-19 12:38:24 +02:00 |
|
yflory
|
f1aef66fc9
|
Fix the drive history
|
2017-06-19 12:35:45 +02:00 |
|