Commit graph

4064 commits

Author SHA1 Message Date
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
ansuz
f15ec4efe9 add tagging to whiteboard and file apps 2017-10-03 18:05:28 +02:00
ansuz
f90742603e style fixes 2017-10-03 17:53:28 +02:00
Caleb James DeLisle
d6570ad9f2 Standardize media-tag embedder and make media tags always absolute URL, Standardize import/export logic for codemirror apps, fix arrow key navigation in presentation fullscreen mode before first click. 2017-10-03 17:57:57 +03:00
yflory
707d3b3e94 Ability to export polls as csv 2017-10-03 16:50:59 +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
Caleb James DeLisle
94d2f4472b Stop using presentSuccess because it is hidden behind the modal in slide 2017-10-03 12:10:16 +03: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
Caleb James DeLisle
53f65f6a87 Merge branch 'staging' into framework 2017-10-02 17:46:27 +03: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
Caleb James DeLisle
1e5bc5da14 onReady should only be called once, onContentUpdate should be able to throw and there should be a generic normalizer 2017-10-02 15:09:25 +03:00
Caleb James DeLisle
7230c780a1 Get rid of last usages of cryptpad-common in pad/inner 2017-10-02 15:06:01 +03:00
Caleb James DeLisle
12e82e80ec When changing the title of a presentation, the title in the bottom of the slide should also change 2017-10-02 15:04:44 +03:00
ansuz
0a99478d9f catch diffdom errors and plow through 2017-09-28 11:50:35 +02:00
ansuz
0f9e93e1de make tests pass again 2017-09-28 10:36:40 +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
66da349ee4 Sandboxed Poll app with less2 2017-09-27 18:52:04 +02:00
Caleb James DeLisle
f95acda758 Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/ 2017-09-27 16:53:16 +02:00
Caleb James DeLisle
6dbc02e81a Merge branch 'staging' into framework 2017-09-27 12:01:18 +02:00
Caleb James DeLisle
1c791b5b51 Fix framework by removing some async and also fix media tags 2017-09-27 11:58:14 +02:00
Caleb James DeLisle
90d00c10b1 Make metadata-manager a bit more robust 2017-09-27 11:56:25 +02:00
yflory
9b2251005c Merge branch 'staging' into newpoll 2017-09-27 10:36:33 +02:00
yflory
8de1852ab9 Lint compliance 2017-09-27 10:36:16 +02:00
yflory
2c10f9b07b Merge branch 'staging' into newpoll 2017-09-27 10:32:03 +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
c1275b5671 Prepare secure poll 2017-09-27 10:28:10 +02:00
yflory
767027b237 Lint 2017-09-27 10:16:24 +02:00
yflory
4c394e0031 Fix UI issue in poll 2017-09-27 10:15:23 +02:00
yflory
0df9e5ace0 Fix toolbar in polls 2017-09-27 10:09:47 +02:00
Caleb James DeLisle
342b6012f7 manual merge of staging into framework 2017-09-26 17:11:45 +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
ansuz
9571b3c018 persist whiteboard content across sessions 2017-09-26 15:16:17 +02:00
ansuz
748172585e update for modified id 2017-09-26 15:00:25 +02:00
ansuz
4cd7d8eda4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-26 14:35:02 +02:00
yflory
345bfc1cea Remove migration for pad attributes 2017-09-26 14:36:49 +02:00
ansuz
52be5501d6 remove invalid test 2017-09-26 14:34:54 +02:00
yflory
69014e5fde Fix mediatags in pad not cached 2017-09-26 11:21:36 +02:00
ansuz
b3e066eaca show loading screen tips during loading screen 2017-09-26 10:59:25 +02:00
Caleb James DeLisle
77fe6a9bba small bug fixes 2017-09-26 10:23:35 +02:00