yflory
|
3e4faf1be1
|
Add new state messages in the toolbar
|
2017-10-20 18:12:47 +02:00 |
|
Caleb James DeLisle
|
a149152f11
|
Merge branch 'staging' into framework
|
2017-10-18 11:42:31 +03:00 |
|
yflory
|
e553351b79
|
Put the add friend button in the userlist below the name
|
2017-10-17 12:39:25 +02:00 |
|
yflory
|
6920129126
|
Embed images from the drive in whiteboard
|
2017-10-17 12:19:57 +02:00 |
|
yflory
|
2fd120100a
|
Merge branch 'wb' into staging
|
2017-10-13 16:58:59 +02:00 |
|
Caleb James DeLisle
|
15337603bb
|
Merge branch 'staging' into framework
|
2017-10-13 13:41:24 +03:00 |
|
Caleb James DeLisle
|
753e2d797e
|
Merge branch 'staging' into framework
|
2017-10-12 17:07:10 +03:00 |
|
yflory
|
62bc72847f
|
Add an error message when trying to tag a deleted pad
|
2017-10-12 15:06:29 +02:00 |
|
yflory
|
50090a3af6
|
Add placeholders for the comment form in poll
|
2017-10-12 12:18:32 +02:00 |
|
yflory
|
ecb537ac7f
|
Move code to render.js in poll
|
2017-10-10 18:19:49 +02:00 |
|
yflory
|
c985aa60aa
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-09 17:30:14 +02:00 |
|
yflory
|
f4189f883e
|
Add missing french translation keys
|
2017-10-09 17:28:56 +02:00 |
|
ansuz
|
128c9c2f4e
|
Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin
|
2017-10-09 17:20:23 +02:00 |
|
ansuz
|
d046b9ce33
|
add missing French key
|
2017-10-09 17:16:48 +02:00 |
|
ansuz
|
f0bdc3b26f
|
second try
|
2017-10-09 16:57:30 +02:00 |
|
ansuz
|
d50a692986
|
add note about tags to prompt
|
2017-10-09 16:51:57 +02:00 |
|
CatalinScr
|
21f1a48380
|
changed the login in button
|
2017-10-09 17:17:33 +03:00 |
|
yflory
|
d3d6940b69
|
Update french translation for tags
|
2017-10-09 15:47:28 +02:00 |
|
ansuz
|
3f181fa370
|
update loading screen tip for tags
|
2017-10-09 15:38:33 +02:00 |
|
ansuz
|
f751554f82
|
update footer and package.json for upcoming version
|
2017-10-09 15:15:04 +02:00 |
|
yflory
|
dd141b5c9f
|
Disable comments when a poll is not published
|
2017-10-09 14:08:54 +02:00 |
|
yflory
|
5e7bf0cfb8
|
Embed an image in whiteboard
|
2017-10-09 10:32:24 +02:00 |
|
Caleb James DeLisle
|
f0eb58ee95
|
Merge branch 'staging' into framework
|
2017-10-06 14:50:35 +03:00 |
|
yflory
|
ab3648a30a
|
Merge branch 'newpoll' into staging
|
2017-10-05 17:56:17 +02:00 |
|
yflory
|
1c4f1c785d
|
Improve stability and UI in poll and its comments
|
2017-10-05 17:54:07 +02:00 |
|
ansuz
|
080511efcd
|
add missing translation for hashtags
|
2017-10-05 17:01:39 +02:00 |
|
Caleb James DeLisle
|
d9e97b86e6
|
Merge branch 'staging' into framework
|
2017-10-05 12:14:37 +03:00 |
|
Caleb James DeLisle
|
383c2f54cb
|
1. Add a class cp-hidden-if-readonly which is display:none if the pad is in read-only mode. 2. Don't show color pickers or options when in read-only on presentation.
|
2017-10-05 12:14:03 +03:00 |
|
yflory
|
26dfc65c25
|
Comments in polls
|
2017-10-04 19:06:16 +02:00 |
|
yflory
|
846b1a9fb3
|
Improve description UI in poll. Enable tags and mediatag
|
2017-10-04 15:39:18 +02:00 |
|
yflory
|
68bda92291
|
Use codemirror for description in poll
|
2017-10-03 19:04:29 +02:00 |
|
ansuz
|
e2f53eaddb
|
add loading screen tip about hashtags
|
2017-10-03 18:39:03 +02:00 |
|
ansuz
|
b8ce149db6
|
add hint about tag usage
|
2017-10-03 18:36:34 +02:00 |
|
yflory
|
5cf86bf74a
|
Update UI in poll and remove old code
|
2017-10-03 14:11:11 +02:00 |
|
Caleb James DeLisle
|
94d2f4472b
|
Stop using presentSuccess because it is hidden behind the modal in slide
|
2017-10-03 12:10:16 +03:00 |
|
ansuz
|
351b95d6a9
|
resolve merge conflicts
|
2017-10-02 18:59:47 +02:00 |
|
Caleb James DeLisle
|
fa6938baa8
|
1. Migrated /slide/ to use framework
2. Fixed CSS not being applied on /slide/
3. Minor changes to /code/ to reuse code which is also used on /slide/
|
2017-10-02 17:34:37 +03:00 |
|
yflory
|
66da349ee4
|
Sandboxed Poll app with less2
|
2017-09-27 18:52:04 +02:00 |
|
yflory
|
e02a779c14
|
Use secure drive as default drive
|
2017-09-27 10:31:35 +02:00 |
|
yflory
|
b4de31c827
|
Merge branch 'newdrive' into staging
|
2017-09-27 10:28:16 +02:00 |
|
yflory
|
767027b237
|
Lint
|
2017-09-27 10:16:24 +02:00 |
|
yflory
|
0df9e5ace0
|
Fix toolbar in polls
|
2017-09-27 10:09:47 +02:00 |
|
ansuz
|
b3e066eaca
|
show loading screen tips during loading screen
|
2017-09-26 10:59:25 +02:00 |
|
yflory
|
cdeac00633
|
Merge branch 'staging' into newdrive
|
2017-09-25 17:35:06 +02:00 |
|
yflory
|
1d7683503f
|
Fix link origin in sframe upload table
|
2017-09-25 12:44:05 +02:00 |
|
yflory
|
92c808812a
|
Fix missing style in toolbar/less2
|
2017-09-25 11:59:05 +02:00 |
|
yflory
|
c364377d7c
|
Use less2 in sframe drive
|
2017-09-25 11:48:42 +02:00 |
|
yflory
|
dfdeb7b113
|
Fix style and race condition for history mode
|
2017-09-21 18:00:33 +02:00 |
|
yflory
|
a810d7bd85
|
Fix style and race condition for history mode
|
2017-09-21 18:00:11 +02:00 |
|
yflory
|
456370b1aa
|
Base for Drive in sandboxed iframe
|
2017-09-21 17:59:26 +02:00 |