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
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
ansuz
5c405090e1
pin ckeditor version
2017-09-18 15:09:39 +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
927a4b948f
Merge branch 'soon' into staging
2017-09-14 14:05:55 +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
e0ae0fcd91
thanks Dima!
2017-09-13 17:47:49 +02:00
