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 |
|
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
|
bd1db735dd
|
jshint compliance
|
2017-06-22 16:02:20 +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
|
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 |