dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,937 Commits 92 Branches 135 Tags 578 MiB
Commit Graph

1139 Commits

Author SHA1 Message Date
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
ansuz 95302366d1 lint compliance 2017-09-21 11:19:23 +02:00
ansuz 53b98c12c9 ignore broken stylesheet 2017-09-20 11:33:30 +02:00
yflory 95542bcdaf Lint 2017-09-19 15:38:19 +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
yflory 6683434c62 Fix wrong relative url 2017-09-19 12:03:45 +02:00
yflory 35a313d6ee Make palette realtime 2017-09-19 11:20:20 +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 f9d27d2783 WIP secure contacts 2017-09-18 15:09:01 +02:00
yflory 1131ef0172 Fix language selection in sandboxed iframes 2017-09-18 14:26:54 +02:00
yflory c00d295466 Add missing translations 2017-09-15 17:33:36 +02:00
yflory 974658453c Mediatag integration in pads 2017-09-15 13:21:37 +02:00
Caleb James DeLisle b24e9b84af Manual merge, update the CSS in loading.js and document that loading.less does nothing. 2017-09-14 10:48:35 +02:00
ansuz 2797a77f5d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 18:18:45 +02:00
ansuz e0ae0fcd91 thanks Dima! 2017-09-13 17:47:49 +02:00
ansuz f039fc7ff5 develop a system for avoiding z-index problems 2017-09-13 17:43:17 +02:00
yflory d360e2d0f4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 16:20:26 +02:00
yflory ab64bf9e59 Use less2 for the loading screen 2017-09-13 16:19:26 +02:00
Caleb James DeLisle 0d8c292fef Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 14:47:55 +02:00