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 |
|
yflory
|
035150614d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-09 15:38:08 +02:00 |
|
yflory
|
484e216054
|
Fix hashtag button in the toolbar
|
2017-10-09 15:37:37 +02:00 |
|
ansuz
|
a12239405b
|
fix toolbar 'home link' to visit home page from drive
|
2017-10-09 15:10:38 +02:00 |
|
yflory
|
aa744567ed
|
Fix thumbnails in sframe apps
|
2017-10-09 11:52:34 +02:00 |
|
yflory
|
1c7c37c121
|
Add the file class to pads in 'template' and 'recent' categories in the drive
|
2017-10-05 18:07:05 +02:00 |
|
yflory
|
ab3648a30a
|
Merge branch 'newpoll' into staging
|
2017-10-05 17:56:17 +02:00 |
|
ansuz
|
503111d26a
|
use recompiled media-tag
|
2017-10-05 17:00:47 +02:00 |
|
ansuz
|
427afc3954
|
override modified file name in pdfjs
|
2017-10-05 16:59:55 +02:00 |
|
ansuz
|
d85db64939
|
add tags from drive
|
2017-10-05 16:58:34 +02:00 |
|
ansuz
|
1f35798194
|
stop event propagation from tag prompt
|
2017-10-05 15:08:34 +02:00 |
|
yflory
|
26dfc65c25
|
Comments in polls
|
2017-10-04 19:06:16 +02:00 |
|
yflory
|
68bda92291
|
Use codemirror for description in poll
|
2017-10-03 19:04:29 +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 |
|
ansuz
|
09c0a473e2
|
fix function signatures
|
2017-10-03 14:08:40 +02:00 |
|
yflory
|
3337689630
|
Wrong translation key in toolbar
|
2017-10-03 14:04:07 +02:00 |
|
yflory
|
126742a1c3
|
Fix bugs in sframe poll and update UI
|
2017-10-02 19:02:31 +02:00 |
|
ansuz
|
351b95d6a9
|
resolve merge conflicts
|
2017-10-02 18:59:47 +02:00 |
|
ansuz
|
6c7b135f91
|
lint compliance
|
2017-10-02 18:58:18 +02:00 |
|
ansuz
|
94c392b79f
|
secure messaging
|
2017-10-02 18:57:17 +02:00 |
|
ansuz
|
48c49e5a75
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-28 10:23:59 +02:00 |
|
ansuz
|
19e58cec94
|
prevent typeError
|
2017-09-28 10:23:48 +02:00 |
|
yflory
|
8de1852ab9
|
Lint compliance
|
2017-09-27 10:36:16 +02:00 |
|
yflory
|
b4de31c827
|
Merge branch 'newdrive' into staging
|
2017-09-27 10:28:16 +02:00 |
|
Caleb James DeLisle
|
cf6030ab8b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-26 15:58:33 +02:00 |
|
Caleb James DeLisle
|
e62c5e1d07
|
Add some debugging lines to help synthesize error cases
|
2017-09-26 15:58:25 +02:00 |
|
yflory
|
345bfc1cea
|
Remove migration for pad attributes
|
2017-09-26 14:36:49 +02:00 |
|
ansuz
|
b3e066eaca
|
show loading screen tips during loading screen
|
2017-09-26 10:59:25 +02:00 |
|
Caleb James DeLisle
|
1fd7a6e2b3
|
Mistake in mkEvent which makes all events only work once
|
2017-09-25 18:03:31 +02:00 |
|
yflory
|
cdeac00633
|
Merge branch 'staging' into newdrive
|
2017-09-25 17:35:06 +02:00 |
|
yflory
|
a8eecee590
|
Fix access to undefined variable in drive
|
2017-09-25 17:29:31 +02:00 |
|
yflory
|
91e36171eb
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-25 17:09:41 +02:00 |
|
yflory
|
138ad17e3e
|
Fix 'import local pads' in settings creating duplicates
|
2017-09-25 17:09:26 +02:00 |
|
yflory
|
d2f1d0c0e9
|
Fix readme pad not added at registration in sframe drive
|
2017-09-25 16:09:54 +02:00 |
|
Caleb James DeLisle
|
ae54cbca33
|
Refactor sframe-cpnf-inner to export chainpad
|
2017-09-25 15:46:04 +02:00 |
|
Caleb James DeLisle
|
44018ee7e1
|
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
|
2017-09-25 15:45:56 +02:00 |
|
Caleb James DeLisle
|
b15527565c
|
Allow passing arguments when firing events
|
2017-09-25 15:45:49 +02:00 |
|
yflory
|
6aeb366767
|
Lint
|
2017-09-25 14:47:19 +02:00 |
|
yflory
|
0600ce59ec
|
Display the 'spinner' when typing in sframe apps
|
2017-09-25 13:19:25 +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
|
4049931924
|
Lint
|
2017-09-25 11:51:24 +02:00 |
|
yflory
|
c364377d7c
|
Use less2 in sframe drive
|
2017-09-25 11:48:42 +02:00 |
|
yflory
|
47fe7b1c53
|
Drive in sandboxed iframe
|
2017-09-22 19:35:06 +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 |
|
ansuz
|
95302366d1
|
lint compliance
|
2017-09-21 11:19:23 +02:00 |