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 |
|
yflory
|
514bff7065
|
Add slide number in the title in slide2
|
2017-09-08 18:21:11 +02:00 |
|
ansuz
|
0ed6846e07
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-08 17:41:46 +02:00 |
|
ansuz
|
b5b9f931c7
|
don't use common-realtime
|
2017-09-08 17:41:05 +02:00 |
|
ansuz
|
32e8c8ef4b
|
implement alertify without alertify
|
2017-09-08 17:40:25 +02:00 |
|
ansuz
|
a302ee5d25
|
guard against undefined arguments
|
2017-09-08 17:39:41 +02:00 |
|
yflory
|
c3a07e879c
|
Merge branch 'staging' into slide2
|
2017-09-08 16:23:07 +02:00 |
|
yflory
|
fc069dac48
|
Ask the user before loading the template picker
|
2017-09-08 16:21:12 +02:00 |
|
yflory
|
05793c220c
|
Fix secure iframes on Edge
|
2017-09-08 15:55:01 +02:00 |
|
yflory
|
290d668ceb
|
Fix race condition preventing slide to work on Edge
|
2017-09-08 15:53:53 +02:00 |
|
ansuz
|
de5d925154
|
autoselect user href in settings
|
2017-09-08 15:07:25 +02:00 |
|
ansuz
|
e950ce74cb
|
focus on input when opening filepicker
|
2017-09-08 15:01:47 +02:00 |
|
ansuz
|
739903d511
|
don't check account usage if you aren't logged in
|
2017-09-08 14:00:49 +02:00 |
|
ansuz
|
bbf7ed3827
|
refactor drive to use dialog.selectable()
fix class on alertify-like boxes
|
2017-09-08 12:24:20 +02:00 |
|
yflory
|
f2aaaa9751
|
Move slide to secure iframe
|
2017-09-07 18:56:58 +02:00 |
|
ansuz
|
809b56625d
|
refactor ui elements
|
2017-09-07 18:54:58 +02:00 |
|
ansuz
|
bca9ba66cb
|
enforce a configurable minimum password length when registering
|
2017-09-07 17:44:04 +02:00 |
|
ansuz
|
1958bca984
|
restore hashing screen in login and register
|
2017-09-07 16:48:22 +02:00 |
|
ansuz
|
fab6264ce6
|
use loading screen from pages.js
|
2017-09-07 16:41:11 +02:00 |
|
ansuz
|
e8298f165a
|
only display first letter of name if user has no avatar
|
2017-09-07 16:35:24 +02:00 |
|
ansuz
|
85003f7a23
|
lint compliance
|
2017-09-07 14:21:54 +02:00 |
|
ansuz
|
cca3c04d43
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-07 12:45:18 +02:00 |
|
ansuz
|
15e24ebe4f
|
ui for hashtag picker
|
2017-09-07 12:45:07 +02:00 |
|
ansuz
|
1b97996ef8
|
implement util.once
|
2017-09-07 12:26:05 +02:00 |
|
yflory
|
0423a5f4e2
|
Clean secure iframe code
|
2017-09-06 18:26:10 +02:00 |
|
yflory
|
04a04aef2b
|
Add setAttribute/getAttribute in secure iframes. Store attributes in settings
|
2017-09-06 16:05:20 +02:00 |
|
yflory
|
61b228db79
|
Fix double / when storing a file
|
2017-09-06 11:41:09 +02:00 |
|
yflory
|
8b2733e2da
|
Fix typo
|
2017-09-06 11:37:19 +02:00 |
|
yflory
|
3ca9f41290
|
Get embed code for pad and code
|
2017-09-06 10:56:27 +02:00 |
|
yflory
|
0bb6698399
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-05 18:40:18 +02:00 |
|
yflory
|
e85b34f127
|
Add embed options in the secure pad hashes
|
2017-09-05 18:38:51 +02:00 |
|
ansuz
|
47ec959032
|
make sure contenteditable is not set in read only mode
|
2017-09-05 18:35:11 +02:00 |
|
ansuz
|
6a735b441f
|
use paul's print styles
|
2017-09-05 18:16:06 +02:00 |
|
ansuz
|
b3d5e04bb4
|
lint compliance
|
2017-09-05 17:23:16 +02:00 |
|
ansuz
|
3d2a2da74e
|
add listAllTags api
|
2017-09-05 16:52:22 +02:00 |
|
yflory
|
31a6881dba
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-05 15:40:02 +02:00 |
|
yflory
|
305feebbbe
|
Fix scroll position when refreshing the drive tree
|
2017-09-05 15:39:49 +02:00 |
|
ansuz
|
0e8a26e8eb
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-05 15:37:02 +02:00 |
|
ansuz
|
1c50bb3f61
|
clear hung tooltips
|
2017-09-05 15:36:46 +02:00 |
|
yflory
|
53eb9bb541
|
Remove the logo from the filepicker loading screen
|
2017-09-05 15:34:38 +02:00 |
|
yflory
|
729c013af7
|
Get mediatag embed code from the file app
|
2017-09-05 15:08:05 +02:00 |
|
yflory
|
904936209a
|
Remove loading tips in the file picker
|
2017-09-05 11:59:42 +02:00 |
|
yflory
|
98cd69e53e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-05 11:57:54 +02:00 |
|
yflory
|
204e45dfae
|
Enable templates in pad
|
2017-09-05 11:57:44 +02:00 |
|
yflory
|
4108520d20
|
Add contacts in the new menu if the user is logged in
|
2017-09-05 11:43:16 +02:00 |
|
ansuz
|
38e1ed93e4
|
Merge branch 'code2' into staging
|
2017-09-05 11:42:00 +02:00 |
|
ansuz
|
acaf45a0e0
|
drop thumbnails if metadata is too large
|
2017-09-05 11:38:49 +02:00 |