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
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
ansuz
cce8811f9a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-12 14:17:46 +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
ansuz
ad591fba50
bump version
2017-09-12 14:04:30 +02:00
yflory
5ac3e97dc8
Merge branch 'master' into staging
2017-09-12 12:20:47 +02:00
yflory
8c3e2dbe61
Missing french translation keys
2017-09-12 11:45: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
