c8928a0811
Switch the transform function and also stop calling textPatcher without the metadata
2017-10-09 17:07:26 +03:00
035150614d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-09 15:38:08 +02:00
484e216054
Fix hashtag button in the toolbar
2017-10-09 15:37:37 +02:00
4c19375f4d
Avoid missing characters in poll's inputs
2017-10-09 15:11:02 +02:00
a12239405b
fix toolbar 'home link' to visit home page from drive
2017-10-09 15:10:38 +02:00
dd141b5c9f
Disable comments when a poll is not published
2017-10-09 14:08:54 +02:00
36aee2d174
lets try normalizing the dom before applying a patch
2017-10-09 14:13:11 +03:00
828a685ba8
Fix broken browser fight logging
2017-10-09 14:12:55 +03:00
aa744567ed
Fix thumbnails in sframe apps
2017-10-09 11:52:34 +02:00
5e7bf0cfb8
Embed an image in whiteboard
2017-10-09 10:32:24 +02:00
f0eb58ee95
Merge branch 'staging' into framework
2017-10-06 14:50:35 +03:00
9509d538e0
Cursor not being updated at the right times before applying a patch.
2017-10-06 14:49:52 +03:00
888028c542
Lint
2017-10-05 18:13:28 +02:00
e5a54b5978
Fix folder highlighting with drag&drop in the drive
2017-10-05 18:12:23 +02:00
1c7c37c121
Add the file class to pads in 'template' and 'recent' categories in the drive
2017-10-05 18:07:05 +02:00
ab3648a30a
Merge branch 'newpoll' into staging
2017-10-05 17:56:17 +02:00
1c4f1c785d
Improve stability and UI in poll and its comments
2017-10-05 17:54:07 +02:00
7559bc062e
lint compliance
2017-10-05 17:06:02 +02:00
503111d26a
use recompiled media-tag
2017-10-05 17:00:47 +02:00
427afc3954
override modified file name in pdfjs
2017-10-05 16:59:55 +02:00
d85db64939
add tags from drive
2017-10-05 16:58:34 +02:00
0aecfad854
Occasionally the language selector only says "Mode" rather than the language
2017-10-05 16:12:49 +03:00
ae87320408
Preview pane cannot be resized after it has been hidden and then shown again
2017-10-05 16:12:24 +03:00
1f35798194
stop event propagation from tag prompt
2017-10-05 15:08:34 +02:00
c936e5ae73
make context menu open correct app on correct port
2017-10-05 11:14:47 +02:00
d9e97b86e6
Merge branch 'staging' into framework
2017-10-05 12:14:37 +03:00
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
deed04108b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-05 10:22:07 +02:00
a90c078e84
correct reference to undefined
2017-10-05 10:21:59 +02:00
26dfc65c25
Comments in polls
2017-10-04 19:06:16 +02:00
5304dc319f
Enable redirection to the previous page after registration
2017-10-04 15:55:57 +02:00
ceb8ff18bd
Fix ghost icon in drive
2017-10-04 15:52:09 +02:00
846b1a9fb3
Improve description UI in poll. Enable tags and mediatag
2017-10-04 15:39:18 +02:00
68bda92291
Use codemirror for description in poll
2017-10-03 19:04:29 +02:00
b8ce149db6
add hint about tag usage
2017-10-03 18:36:34 +02:00
f15ec4efe9
add tagging to whiteboard and file apps
2017-10-03 18:05:28 +02:00
f90742603e
style fixes
2017-10-03 17:53:28 +02:00
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
707d3b3e94
Ability to export polls as csv
2017-10-03 16:50:59 +02:00
5cf86bf74a
Update UI in poll and remove old code
2017-10-03 14:11:11 +02:00
09c0a473e2
fix function signatures
2017-10-03 14:08:40 +02:00
3337689630
Wrong translation key in toolbar
2017-10-03 14:04:07 +02:00
94d2f4472b
Stop using presentSuccess because it is hidden behind the modal in slide
2017-10-03 12:10:16 +03:00
126742a1c3
Fix bugs in sframe poll and update UI
2017-10-02 19:02:31 +02:00
351b95d6a9
resolve merge conflicts
2017-10-02 18:59:47 +02:00
6c7b135f91
lint compliance
2017-10-02 18:58:18 +02:00
94c392b79f
secure messaging
2017-10-02 18:57:17 +02:00
53f65f6a87
Merge branch 'staging' into framework
2017-10-02 17:46:27 +03:00
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
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
7230c780a1
Get rid of last usages of cryptpad-common in pad/inner
2017-10-02 15:06:01 +03:00
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
0a99478d9f
catch diffdom errors and plow through
2017-09-28 11:50:35 +02:00
0f9e93e1de
make tests pass again
2017-09-28 10:36:40 +02:00
48c49e5a75
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-28 10:23:59 +02:00
19e58cec94
prevent typeError
2017-09-28 10:23:48 +02:00
66da349ee4
Sandboxed Poll app with less2
2017-09-27 18:52:04 +02:00
f95acda758
Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/
2017-09-27 16:53:16 +02:00
6dbc02e81a
Merge branch 'staging' into framework
2017-09-27 12:01:18 +02:00
1c791b5b51
Fix framework by removing some async and also fix media tags
2017-09-27 11:58:14 +02:00
90d00c10b1
Make metadata-manager a bit more robust
2017-09-27 11:56:25 +02:00
9b2251005c
Merge branch 'staging' into newpoll
2017-09-27 10:36:33 +02:00
8de1852ab9
Lint compliance
2017-09-27 10:36:16 +02:00
2c10f9b07b
Merge branch 'staging' into newpoll
2017-09-27 10:32:03 +02:00
e02a779c14
Use secure drive as default drive
2017-09-27 10:31:35 +02:00
b4de31c827
Merge branch 'newdrive' into staging
2017-09-27 10:28:16 +02:00
c1275b5671
Prepare secure poll
2017-09-27 10:28:10 +02:00
4c394e0031
Fix UI issue in poll
2017-09-27 10:15:23 +02:00
342b6012f7
manual merge of staging into framework
2017-09-26 17:11:45 +02:00
cf6030ab8b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-26 15:58:33 +02:00
e62c5e1d07
Add some debugging lines to help synthesize error cases
2017-09-26 15:58:25 +02:00
9571b3c018
persist whiteboard content across sessions
2017-09-26 15:16:17 +02:00
748172585e
update for modified id
2017-09-26 15:00:25 +02:00
4cd7d8eda4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-26 14:35:02 +02:00
345bfc1cea
Remove migration for pad attributes
2017-09-26 14:36:49 +02:00
52be5501d6
remove invalid test
2017-09-26 14:34:54 +02:00
69014e5fde
Fix mediatags in pad not cached
2017-09-26 11:21:36 +02:00
b3e066eaca
show loading screen tips during loading screen
2017-09-26 10:59:25 +02:00
77fe6a9bba
small bug fixes
2017-09-26 10:23:35 +02:00
1b01855dd2
Merge branch 'staging' into framework
2017-09-25 18:11:57 +02:00
1fd7a6e2b3
Mistake in mkEvent which makes all events only work once
2017-09-25 18:03:31 +02:00
368a6b2406
manual merge, still wip
2017-09-25 17:35:25 +02:00
cdeac00633
Merge branch 'staging' into newdrive
2017-09-25 17:35:06 +02:00
a8eecee590
Fix access to undefined variable in drive
2017-09-25 17:29:31 +02:00
91e36171eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-25 17:09:41 +02:00
138ad17e3e
Fix 'import local pads' in settings creating duplicates
2017-09-25 17:09:26 +02:00
59ad96e491
Make sure the user is redirected to the drive at registration
2017-09-25 16:11:50 +02:00
d2f1d0c0e9
Fix readme pad not added at registration in sframe drive
2017-09-25 16:09:54 +02:00
ae54cbca33
Refactor sframe-cpnf-inner to export chainpad
2017-09-25 15:46:04 +02:00
44018ee7e1
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
2017-09-25 15:45:56 +02:00
b15527565c
Allow passing arguments when firing events
2017-09-25 15:45:49 +02:00
0eb2165f31
Implement a new pad framework and make it work (seemingly) with /pad/
2017-09-25 15:45:08 +02:00
d9845d3450
Refactor sframe-cpnf-inner to export chainpad
2017-09-25 15:44:03 +02:00
f418ee9632
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
2017-09-25 15:43:02 +02:00
72f03b2a47
Allow passing arguments when firing events
2017-09-25 15:42:08 +02:00
1afbd4648d
Fix old drive
2017-09-25 15:23:42 +02:00
b871faffc9
Enable tags in code and slide
2017-09-25 14:47:31 +02:00
6aeb366767
Lint
2017-09-25 14:47:19 +02:00
0600ce59ec
Display the 'spinner' when typing in sframe apps
2017-09-25 13:19:25 +02:00
1d7683503f
Fix link origin in sframe upload table
2017-09-25 12:44:05 +02:00
92c808812a
Fix missing style in toolbar/less2
2017-09-25 11:59:05 +02:00
deba699d08
Remove old style for sframe drive
2017-09-25 11:54:01 +02:00
4049931924
Lint
2017-09-25 11:51:24 +02:00
c364377d7c
Use less2 in sframe drive
2017-09-25 11:48:42 +02:00
47fe7b1c53
Drive in sandboxed iframe
2017-09-22 19:35:06 +02:00
dfdeb7b113
Fix style and race condition for history mode
2017-09-21 18:00:33 +02:00
a810d7bd85
Fix style and race condition for history mode
2017-09-21 18:00:11 +02:00
456370b1aa
Base for Drive in sandboxed iframe
2017-09-21 17:59:26 +02:00
95302366d1
lint compliance
2017-09-21 11:19:23 +02:00
68f7d4bc0a
more conformant tagPrompt behaviour
2017-09-20 17:55:05 +02:00
db4c3e7e2c
Merge branch 'master' into staging
2017-09-20 12:07:01 +02:00
b5b84f540e
fix preview mode class
2017-09-20 12:02:46 +02:00
f990200996
drop any notion of crypto from sframe-listmap
2017-09-19 18:21:33 +02:00
a1c124f1be
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 15:38:21 +02:00
95542bcdaf
Lint
2017-09-19 15:38:19 +02:00
c9223cb942
listmap does not care about 'readOnly' mode anymore
2017-09-19 15:38:06 +02:00
88914ec6cc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 15:36:38 +02:00
8a09e39f46
Enable tags in pads
2017-09-19 15:30:08 +02:00
d2b27f3588
resolve merge conflicts
2017-09-19 14:24:26 +02:00
4af01e6e9e
make listmap consume cpNfInner
2017-09-19 14:16:13 +02:00
72f0952835
Make sure we can't open a pad using the wrong app
2017-09-19 11:31:45 +02:00
35a313d6ee
Make palette realtime
2017-09-19 11:20:20 +02:00
6fdd66167a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 11:04:59 +02:00
3023e8c855
Fix templates in whiteboard
2017-09-19 11:04:52 +02:00
732585ea7b
Sandboxed iframe for the whiteboard app
2017-09-19 10:27:31 +02:00
029a8e3023
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 10:27:30 +02:00
d72146ba7f
use setAttribute for assigning attributes in hyperscript
2017-09-19 10:27:19 +02:00
a78b597ebb
lint errors
2017-09-18 15:51:47 +02:00
8ce364a252
Add a button to empty the trash in the drive
2017-09-18 15:47:39 +02:00
a1e7bf701d
Select the element after clicking 'show in folder' in the drive search
2017-09-18 15:24:25 +02:00
f9d27d2783
WIP secure contacts
2017-09-18 15:09:01 +02:00
483160a96a
Fix tab notifications in code and slides
2017-09-18 14:31:58 +02:00
1131ef0172
Fix language selection in sandboxed iframes
2017-09-18 14:26:54 +02:00
0a656ca8d6
Fix the splitter in code and add it back
2017-09-18 12:09:18 +02:00
018f71df04
Add drop handlers for mediatags in ckeditor
2017-09-18 10:59:40 +02:00
c00d295466
Add missing translations
2017-09-15 17:33:36 +02:00
a927f40f02
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-15 13:21:45 +02:00
974658453c
Mediatag integration in pads
2017-09-15 13:21:37 +02:00
08e0ae424d
log errors in less compilation
2017-09-14 18:13:03 +02:00
15db6b180c
copy bug fixes from changes
2017-09-14 13:43:13 +02:00
5b45e92250
delete range requests after they have completed
2017-09-14 12:08:41 +02:00
4f6909fce3
set icon to 'faded' styles
2017-09-14 12:07:21 +02:00
086d4bae32
clean up contacts initialization
2017-09-14 12:01:57 +02:00
96d0456f31
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-14 11:54:16 +02:00
1091e0b375
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-14 11:52:52 +02:00
47ce645897
implement slice
2017-09-14 11:51:33 +02:00
a8f7beb20b
remove deprecated apps
2017-09-14 11:36:40 +02:00
6ed4f2fc64
fix a thing
2017-09-14 11:27:10 +02:00
8a564bf350
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-14 11:23:51 +02:00
513f8e73d4
refactor cryptpad.ready to use nthen
2017-09-14 11:23:37 +02:00
c50c297490
Fix the size of the loading screen for the filepicker
2017-09-14 11:03:39 +02:00
b643ccc232
typo
2017-09-14 10:54:16 +02:00
652c916690
change the command in the documentation so that it will not change itself
2017-09-14 10:52:55 +02:00
5f0383ae99
update version of sframe-boot because it was changed
2017-09-14 10:52:25 +02:00
845f75f8a7
remove a 100ms dead spot from page load
2017-09-14 10:48:59 +02:00
b24e9b84af
Manual merge, update the CSS in loading.js and document that loading.less does nothing.
2017-09-14 10:48:35 +02:00
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
4d688289cc
lint-compliance
2017-09-13 18:19:15 +02:00
2797a77f5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 18:18:45 +02:00
47cfa0cf45
Focus the editable content when opening a codemirror pad
2017-09-13 18:09:55 +02:00
f039fc7ff5
develop a system for avoiding z-index problems
2017-09-13 17:43:17 +02:00
bafa401473
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 17:22:48 +02:00
fa64adbbe5
Hide visible elements while loading the slide app
2017-09-13 17:22:43 +02:00
fbd4be6135
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 16:32:41 +02:00
d360e2d0f4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 16:20:26 +02:00
ab64bf9e59
Use less2 for the loading screen
2017-09-13 16:19:26 +02:00
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
a332168926
fix some bugs in prompts, alerts, confirms
2017-09-13 15:52:31 +02:00
0db33d48fc
properly handle variable args in Cryptpad.alert
2017-09-13 14:52:58 +02:00
8a87ec180e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 14:52:26 +02:00
0d8c292fef
Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 14:47:55 +02:00
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
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
dc86579d46
use an 8 character password for tests
2017-09-13 14:00:48 +02:00
e1f090bb9d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 12:33:05 +02:00
244e3ecba7
support forefront flag in alert config
2017-09-13 12:32:30 +02:00
63cb5dfc1e
Make less loader rewrite urls to use version parameter
2017-09-13 12:04:24 +02:00
d967df2cec
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 11:00:09 +02:00
e3c0ec29f7
Hopefully chase out a race in sframe-channel
2017-09-13 11:00:00 +02:00
8c41e0bdd6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-12 18:40:20 +02:00
437f50fd4a
Migrate the file to a sandboxed iframe
2017-09-12 18:40:11 +02:00
1713167a5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-12 14:12:41 +02:00
981a919328
Added tooltips back to sframe land with hopefully a more robust removal.
2017-09-12 14:12:35 +02:00
5ac3e97dc8
Merge branch 'master' into staging
2017-09-12 12:20:47 +02:00
7d720c73a9
Merge branch 'soon'
2017-09-12 11:34:12 +02:00
ddbda08c88
Fix an issue when cleaning the template category in the drive
2017-09-12 11:32:32 +02:00
9d229b8868
lint compliance
2017-09-12 11:30:43 +02:00
5b3667fd4e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-12 11:29:57 +02:00
63700cb791
Fix an issue when cleaning the template category in the drive
2017-09-12 11:29:24 +02:00
a87ccdc37e
remove redundant lines
2017-09-12 11:27:24 +02:00
da0e31fa54
guard against possible type errors
2017-09-12 11:20:50 +02:00
0f9da69185
Show if a pad has been renamed in the drive
2017-09-12 11:17:52 +02:00
499b5ea2ba
warn that a password is too short before doing anything else
2017-09-12 10:50:59 +02:00
a0b3201df3
fix focus on alerts, prompts, and confirms. call back from alerts
2017-09-12 10:49:48 +02:00
a74915ab58
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-11 17:52:40 +02:00
671c893e8a
Duplicating code like a moron, this should hopefully get fixed later.
2017-09-11 17:52:34 +02:00
5a4836fe6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-11 16:36:41 +02:00
79094aa4bb
Fix closing the title input when the title is not modified
2017-09-11 16:36:24 +02:00
58c38dd77b
focus on the current window when you pop an alert
2017-09-11 16:34:00 +02:00
b9545f45f7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-11 16:26:21 +02:00
Caleb James DeLisle