blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4100 commits 72 branches 132 tags 541 MiB
Commit graph

2940 commits

Author SHA1 Message Date
ansuz
d85db64939 add tags from drive 2017-10-05 16:58:34 +02:00
Caleb James DeLisle
0aecfad854 Occasionally the language selector only says "Mode" rather than the language 2017-10-05 16:12:49 +03:00
Caleb James DeLisle
ae87320408 Preview pane cannot be resized after it has been hidden and then shown again 2017-10-05 16:12:24 +03:00
ansuz
1f35798194 stop event propagation from tag prompt 2017-10-05 15:08:34 +02:00
ansuz
c936e5ae73 make context menu open correct app on correct port 2017-10-05 11:14:47 +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
ansuz
deed04108b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-05 10:22:07 +02:00
ansuz
a90c078e84 correct reference to undefined 2017-10-05 10:21:59 +02:00
yflory
26dfc65c25 Comments in polls 2017-10-04 19:06:16 +02:00
yflory
5304dc319f Enable redirection to the previous page after registration 2017-10-04 15:55:57 +02:00
yflory
ceb8ff18bd Fix ghost icon in drive 2017-10-04 15:52:09 +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
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
4c394e0031 Fix UI issue in poll 2017-09-27 10:15:23 +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
Caleb James DeLisle
1b01855dd2 Merge branch 'staging' into framework 2017-09-25 18:11:57 +02:00
Caleb James DeLisle
1fd7a6e2b3 Mistake in mkEvent which makes all events only work once 2017-09-25 18:03:31 +02:00
Caleb James DeLisle
368a6b2406 manual merge, still wip 2017-09-25 17:35:25 +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
59ad96e491 Make sure the user is redirected to the drive at registration 2017-09-25 16:11:50 +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
Caleb James DeLisle
0eb2165f31 Implement a new pad framework and make it work (seemingly) with /pad/ 2017-09-25 15:45:08 +02:00
Caleb James DeLisle
d9845d3450 Refactor sframe-cpnf-inner to export chainpad 2017-09-25 15:44:03 +02:00
Caleb James DeLisle
f418ee9632 Improve the LessLoader check to hopefully stop the message saying cookies were blocked. 2017-09-25 15:43:02 +02:00
Caleb James DeLisle
72f03b2a47 Allow passing arguments when firing events 2017-09-25 15:42:08 +02:00
yflory
1afbd4648d Fix old drive 2017-09-25 15:23:42 +02:00
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
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
4af01e6e9e make listmap consume cpNfInner 2017-09-19 14:16:13 +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
yflory
a78b597ebb lint errors 2017-09-18 15:51:47 +02:00
yflory
8ce364a252 Add a button to empty the trash in the drive 2017-09-18 15:47:39 +02:00
yflory
a1e7bf701d Select the element after clicking 'show in folder' in the drive search 2017-09-18 15:24:25 +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
ansuz
08e0ae424d log errors in less compilation 2017-09-14 18:13:03 +02:00
ansuz
15db6b180c copy bug fixes from changes 2017-09-14 13:43:13 +02:00
ansuz
5b45e92250 delete range requests after they have completed 2017-09-14 12:08:41 +02:00
ansuz
4f6909fce3 set icon to 'faded' styles 2017-09-14 12:07:21 +02:00
ansuz
086d4bae32 clean up contacts initialization 2017-09-14 12:01:57 +02:00
yflory
96d0456f31 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-14 11:54:16 +02:00
yflory
1091e0b375 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-14 11:52:52 +02:00
ansuz
47ce645897 implement slice 2017-09-14 11:51:33 +02:00
ansuz
a8f7beb20b remove deprecated apps 2017-09-14 11:36:40 +02:00
ansuz
6ed4f2fc64 fix a thing 2017-09-14 11:27:10 +02:00
ansuz
8a564bf350 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-14 11:23:51 +02:00
ansuz
513f8e73d4 refactor cryptpad.ready to use nthen 2017-09-14 11:23:37 +02:00
yflory
c50c297490 Fix the size of the loading screen for the filepicker 2017-09-14 11:03:39 +02:00
Caleb James DeLisle
b643ccc232 typo 2017-09-14 10:54:16 +02:00
Caleb James DeLisle
652c916690 change the command in the documentation so that it will not change itself 2017-09-14 10:52:55 +02:00
Caleb James DeLisle
5f0383ae99 update version of sframe-boot because it was changed 2017-09-14 10:52:25 +02:00
Caleb James DeLisle
845f75f8a7 remove a 100ms dead spot from page load 2017-09-14 10:48:59 +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
Caleb James DeLisle
8a32b72ffc 1. implement cryptpadCache which has put() and get() functions that can be used like a localStorage that auto-flushes when a new version is released 
2. change loading.js to use packaged css in order to get the loading screen up as quick as possible.
3. change LessLoader to cache less in cryptpadCache
 2017-09-14 10:23:05 +02:00
ansuz
4d688289cc lint-compliance 2017-09-13 18:19:15 +02:00
ansuz
2797a77f5d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 18:18:45 +02:00
yflory
47cfa0cf45 Focus the editable content when opening a codemirror pad 2017-09-13 18:09:55 +02:00
ansuz
f039fc7ff5 develop a system for avoiding z-index problems 2017-09-13 17:43:17 +02:00
yflory
bafa401473 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 17:22:48 +02:00
yflory
fa64adbbe5 Hide visible elements while loading the slide app 2017-09-13 17:22:43 +02:00
ansuz
fbd4be6135 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 16:32:41 +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
710418f42f Make LessLoader able to cache even inside of the sandbox iframe and don't load less compiler unless needed 2017-09-13 16:04:01 +02:00
ansuz
a332168926 fix some bugs in prompts, alerts, confirms 2017-09-13 15:52:31 +02:00
ansuz
0db33d48fc properly handle variable args in Cryptpad.alert 2017-09-13 14:52:58 +02:00
ansuz
8a87ec180e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 14:52: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
Caleb James DeLisle
789a923792 Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter 2017-09-13 14:47:50 +02:00
Caleb James DeLisle
d46cc8226d Update LessLoader to be capable of loading CSS as well as less files and properly rewrite the URLs 2017-09-13 14:46:41 +02:00
ansuz
dc86579d46 use an 8 character password for tests 2017-09-13 14:00:48 +02:00
ansuz
e1f090bb9d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 12:33:05 +02:00
ansuz
244e3ecba7 support forefront flag in alert config 2017-09-13 12:32:30 +02:00
Caleb James DeLisle
63cb5dfc1e Make less loader rewrite urls to use version parameter 2017-09-13 12:04:24 +02:00
Caleb James DeLisle
d967df2cec Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 11:00:09 +02:00
Caleb James DeLisle
e3c0ec29f7 Hopefully chase out a race in sframe-channel 2017-09-13 11:00:00 +02:00
yflory
8c41e0bdd6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-12 18:40:20 +02:00
yflory
437f50fd4a Migrate the file to a sandboxed iframe 2017-09-12 18:40:11 +02:00
Caleb James DeLisle
1713167a5d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-12 14:12:41 +02:00
Caleb James DeLisle
981a919328 Added tooltips back to sframe land with hopefully a more robust removal. 2017-09-12 14:12:35 +02:00
yflory
5ac3e97dc8 Merge branch 'master' into staging 2017-09-12 12:20:47 +02:00
yflory
7d720c73a9 Merge branch 'soon' 2017-09-12 11:34:12 +02:00
yflory
ddbda08c88 Fix an issue when cleaning the template category in the drive 2017-09-12 11:32:32 +02:00
ansuz
9d229b8868 lint compliance 2017-09-12 11:30:43 +02:00
yflory
5b3667fd4e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-12 11:29:57 +02:00
yflory
63700cb791 Fix an issue when cleaning the template category in the drive 2017-09-12 11:29:24 +02:00
ansuz
a87ccdc37e remove redundant lines 2017-09-12 11:27:24 +02:00
ansuz
da0e31fa54 guard against possible type errors 2017-09-12 11:20:50 +02:00
yflory
0f9da69185 Show if a pad has been renamed in the drive 2017-09-12 11:17:52 +02:00
ansuz
499b5ea2ba warn that a password is too short before doing anything else 2017-09-12 10:50:59 +02:00
ansuz
a0b3201df3 fix focus on alerts, prompts, and confirms. call back from alerts 2017-09-12 10:49:48 +02:00
Caleb James DeLisle
a74915ab58 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-11 17:52:40 +02:00
Caleb James DeLisle
671c893e8a Duplicating code like a moron, this should hopefully get fixed later. 2017-09-11 17:52:34 +02:00
yflory
5a4836fe6d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-11 16:36:41 +02:00
yflory
79094aa4bb Fix closing the title input when the title is not modified 2017-09-11 16:36:24 +02:00
ansuz
58c38dd77b focus on the current window when you pop an alert 2017-09-11 16:34:00 +02:00
ansuz
b9545f45f7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-11 16:26:21 +02:00
ansuz
306fec2d0e improve messages for template picker confirm 2017-09-11 16:25:58 +02:00
ansuz
1943c83f69 clean up api for Cryptpad.confirm 2017-09-11 16:24:43 +02:00
Caleb James DeLisle
8d3ebdbaf7 I'm stupid 2017-09-11 15:53:27 +02:00
Caleb James DeLisle
041071e61c manual merge 2017-09-11 15:52:14 +02:00
Caleb James DeLisle
7334173b4a Hopefully fix infinite spinner whenever there is a disconnect (pad) 2017-09-11 15:46:21 +02:00
yflory
9271b0c1a8 Try to fix half-codemirror bug 2017-09-11 14:42:43 +02:00
yflory
304a8df808 Remove unneeded migration and fix attributes migration 2017-09-11 14:25:19 +02:00
ansuz
5a1abc8986 let's try using actual js syntax 2017-09-11 14:04:40 +02:00
ansuz
134c6057c1 Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2 2017-09-11 14:01:05 +02:00
ansuz
59d25b4c1a use camel case, not snek case 2017-09-11 14:00:27 +02:00
ansuz
520b8967fd allow people with short passwords to log in 2017-09-11 13:54:48 +02:00
yflory
8ef27dca08 Lint 2017-09-11 12:25:23 +02:00
yflory
1aef844fc3 Fix title attribute for truncated titles in the drive 2017-09-11 12:23:24 +02:00
yflory
55fe882f64 Fix readonly mode in code 2017-09-11 12:23:04 +02:00
yflory
bd422178c4 Hide the filepicker button in readonly mode 2017-09-11 11:59:09 +02:00
yflory
51f1be9f7a Improve the input style when renaming a folder in the drive tree 2017-09-11 11:50:04 +02:00
yflory
642511dc3b Disable exiting present mode when in embed mode 2017-09-11 11:38:40 +02:00
yflory
403b62f131 Fix ghost icon modal and improve UI on mobile 2017-09-11 11:04:14 +02:00
yflory
757d0a2800 Save the state of CKEditor's toolbar (visible or hidden) 2017-09-11 10:10:29 +02:00
yflory
5bf966633c Merge branch 'staging' into slide2 2017-09-08 18:21:38 +02:00