Commit graph

3947 commits

Author SHA1 Message Date
yflory
b871faffc9 Enable tags in code and slide 2017-09-25 14:47:31 +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
deba699d08 Remove old style for sframe drive 2017-09-25 11:54:01 +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
ansuz
68f7d4bc0a more conformant tagPrompt behaviour 2017-09-20 17:55:05 +02:00
ansuz
db4c3e7e2c Merge branch 'master' into staging 2017-09-20 12:07:01 +02:00
ansuz
b5b84f540e fix preview mode class 2017-09-20 12:02:46 +02:00
ansuz
53b98c12c9 ignore broken stylesheet 2017-09-20 11:33:30 +02:00
ansuz
f990200996 drop any notion of crypto from sframe-listmap 2017-09-19 18:21:33 +02:00
ansuz
a1c124f1be Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-19 15:38:21 +02:00
yflory
95542bcdaf Lint 2017-09-19 15:38:19 +02:00
ansuz
c9223cb942 listmap does not care about 'readOnly' mode anymore 2017-09-19 15:38:06 +02:00
yflory
88914ec6cc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-19 15:36:38 +02:00
yflory
8a09e39f46 Enable tags in pads 2017-09-19 15:30:08 +02:00
ansuz
d2b27f3588 resolve merge conflicts 2017-09-19 14:24:26 +02:00
ansuz
f127240a2f add poll to main.less 2017-09-19 14:23:54 +02:00
ansuz
4af01e6e9e make listmap consume cpNfInner 2017-09-19 14:16:13 +02:00
yflory
6683434c62 Fix wrong relative url 2017-09-19 12:03:45 +02:00
yflory
72f0952835 Make sure we can't open a pad using the wrong app 2017-09-19 11:31:45 +02:00
yflory
35a313d6ee Make palette realtime 2017-09-19 11:20:20 +02:00
yflory
6fdd66167a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-19 11:04:59 +02:00
yflory
3023e8c855 Fix templates in whiteboard 2017-09-19 11:04:52 +02:00
yflory
732585ea7b Sandboxed iframe for the whiteboard app 2017-09-19 10:27:31 +02:00
ansuz
029a8e3023 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-19 10:27:30 +02:00
ansuz
d72146ba7f use setAttribute for assigning attributes in hyperscript 2017-09-19 10:27:19 +02:00
Genma
2ceb925d9b Link to cryptad releases documentation added. 2017-09-18 16:11:40 +02:00
yflory
a78b597ebb lint errors 2017-09-18 15:51:47 +02:00
yflory
92ea3593cd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-18 15:47:52 +02:00
yflory
8ce364a252 Add a button to empty the trash in the drive 2017-09-18 15:47:39 +02:00
ansuz
937d323780 don't assume anything ckeditor-related is lint compliant 2017-09-18 15:31:02 +02:00
yflory
a1e7bf701d Select the element after clicking 'show in folder' in the drive search 2017-09-18 15:24:25 +02:00
Genma
0a18e09440 Cryptad version in Readme.md added
Because this information was lacking and I need to find it quickly (and probably other people).
Don't forget to update this part at each new released.
2017-09-18 15:11:17 +02:00
ansuz
5c405090e1 pin ckeditor version 2017-09-18 15:09:39 +02:00
ansuz
f9d27d2783 WIP secure contacts 2017-09-18 15:09:01 +02:00
yflory
483160a96a Fix tab notifications in code and slides 2017-09-18 14:31:58 +02:00
yflory
1131ef0172 Fix language selection in sandboxed iframes 2017-09-18 14:26:54 +02:00
yflory
0a656ca8d6 Fix the splitter in code and add it back 2017-09-18 12:09:18 +02:00
yflory
018f71df04 Add drop handlers for mediatags in ckeditor 2017-09-18 10:59:40 +02:00
yflory
c00d295466 Add missing translations 2017-09-15 17:33:36 +02:00
yflory
a927f40f02 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-15 13:21:45 +02:00
yflory
974658453c Mediatag integration in pads 2017-09-15 13:21:37 +02:00