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 |
|
Caleb James DeLisle
|
684a12ce2e
|
Update pinneddata to work on blobs too
|
2017-09-08 11:35:45 +02:00 |
|
Caleb James DeLisle
|
fe2454ba31
|
add the ability to filter for old pads using pinneddata.js
|
2017-09-08 10:39:45 +02:00 |
|
Paul Libbrecht
|
1ae7076790
|
Merge branch 'master' of https://github.com/xwiki-labs/cryptpad
|
2017-09-07 22:08:34 +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
|
ef30b0bc42
|
contribute to z-index arms race
|
2017-09-07 16:50:06 +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
|
a6eb1444df
|
add loading screen markup to register and login
|
2017-09-07 16:39:42 +02:00 |
|
ansuz
|
352d504944
|
avoid loading unnecessary files
|
2017-09-07 16:39:20 +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
|
263c2eb2c2
|
fix overflowing title text
|
2017-09-07 14:17:43 +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
|
fe8b2c2556
|
Fix french translation
|
2017-09-06 15:43:30 +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
|
1be12a7f15
|
Merge branch 'soon' into staging
|
2017-09-06 11:21:59 +02:00 |
|
yflory
|
8f2776657b
|
Add translations for pad embed
|
2017-09-06 11:21:53 +02:00 |
|
yflory
|
c713b44a4a
|
Merge branch 'soon'
|
2017-09-06 11:13:10 +02:00 |
|
yflory
|
d98bbf7df9
|
Fix the pad app when cryptpad is in an iframe
|
2017-09-06 11:03:20 +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 |
|
Paul Libbrecht
|
e7de9229a8
|
Do not print toolbar and collaboration (#178).
paul
|
2017-09-05 17:29:03 +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 |