yflory
|
64b51f3a80
|
jshint compliance
|
2018-07-18 14:25:48 +02:00 |
|
yflory
|
ebfa2c2dc3
|
Merge branch 'less-less' into staging
|
2018-07-18 14:18:37 +02:00 |
|
yflory
|
aafcb1bc02
|
Merge branch 'sharedfolder' into staging
|
2018-07-18 14:18:30 +02:00 |
|
Caleb James DeLisle
|
8d95efa144
|
Reference the relevant line in alertify.js
|
2018-07-18 13:22:27 +02:00 |
|
Caleb James DeLisle
|
a57a8e51a1
|
Prevent alertify.js from overriding styles
|
2018-07-18 13:20:16 +02:00 |
|
Caleb James DeLisle
|
a2e096b6f3
|
Unfortunately, optional parameters need to be optional in both .<filename>_vars() and .<filename>_main()
|
2018-07-18 12:58:24 +02:00 |
|
Caleb James DeLisle
|
f1642fca89
|
Test before pushing :|
|
2018-07-18 12:53:32 +02:00 |
|
Caleb James DeLisle
|
83ec00d948
|
Added fallbacks for avatar.less
|
2018-07-18 12:48:51 +02:00 |
|
yflory
|
ff6bb31eef
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-07-18 11:40:41 +02:00 |
|
yflory
|
3fe150f936
|
Fix UI issues in the PCS with IE
|
2018-07-18 11:40:28 +02:00 |
|
ansuz
|
e110f20397
|
support blocks on remote domains
|
2018-07-17 17:41:30 +02:00 |
|
yflory
|
e59aec0a45
|
Try...catch on testworker.js
|
2018-07-17 16:46:24 +02:00 |
|
yflory
|
3a7d1e5beb
|
Fix 'save to drive' icon displayed for anonymous users in whiteboard
|
2018-07-17 16:41:50 +02:00 |
|
yflory
|
08005a709e
|
Add a share icon in the drive when displaying a shared folder
|
2018-07-17 16:38:20 +02:00 |
|
ansuz
|
1629d7bb1d
|
provide a SANE default in case httpUnsafeOrigin is not provided
|
2018-07-17 16:31:15 +02:00 |
|
Caleb James DeLisle
|
38a1e5e39f
|
Add fallback for browsers which do not support CSS variables
|
2018-07-17 16:21:54 +02:00 |
|
ansuz
|
bcbec0144c
|
provide a default in case httpUnsafeOrigin is not provided
|
2018-07-17 16:20:40 +02:00 |
|
ansuz
|
ee16b3ab15
|
modified english translations
|
2018-07-17 16:07:08 +02:00 |
|
yflory
|
9157403946
|
Update French translation
|
2018-07-17 16:06:12 +02:00 |
|
yflory
|
6143bceabb
|
Fix XXX
|
2018-07-17 15:38:23 +02:00 |
|
ansuz
|
4bf741e959
|
fix typo in translations
|
2018-07-17 14:54:54 +02:00 |
|
ansuz
|
bad58c6dc8
|
Merge branch 'soon' into staging
|
2018-07-17 14:49:48 +02:00 |
|
ansuz
|
a2fd32d6a3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-07-17 14:49:19 +02:00 |
|
ansuz
|
32d84e8f36
|
initialize new registrations with a v2 hash
|
2018-07-17 14:49:03 +02:00 |
|
ansuz
|
e6d4bced18
|
clean up extraneous variables and log statements
|
2018-07-17 14:34:25 +02:00 |
|
yflory
|
b4c294565e
|
Hide shared folder creation links when inside a shared folder
|
2018-07-17 14:00:28 +02:00 |
|
yflory
|
ecb9f039b1
|
Fix pad password change not reloading with the correct URL
|
2018-07-17 12:27:23 +02:00 |
|
yflory
|
c9ac3c7c2b
|
Fix search in shared folders
|
2018-07-17 11:22:01 +02:00 |
|
ansuz
|
2950f5f679
|
Merge pull request #259 from mcrosson/docker-fix-storage-var
Minor Dockerfile updates/fixes
|
2018-07-17 10:54:14 +02:00 |
|
ansuz
|
c180fd9a2a
|
Merge pull request #258 from mcrosson/docker-arm64-support
Add Dockerfile for arm64 support
|
2018-07-17 10:53:31 +02:00 |
|
ansuz
|
7f01694f89
|
Merge pull request #257 from mcrosson/docker-bust-cache-on-run
Update docker start script to bust the cache on each run
|
2018-07-17 10:52:53 +02:00 |
|
mcrosson
|
b558004fb8
|
Expose port 3001 for safe http port ; fix STORAGE variable so it doesn't break the config at runtime
|
2018-07-16 19:13:57 +00:00 |
|
mcrosson
|
172263d190
|
Expose safe port, fix storage variable so it doesn't cause a break in the config at runtime
|
2018-07-16 19:12:49 +00:00 |
|
mcrosson
|
b8a745832d
|
Add Dockerfile for arm64 support
|
2018-07-16 17:16:22 +00:00 |
|
mcrosson
|
b35959376e
|
Update docker start script to bust the cache on each run
|
2018-07-16 17:10:40 +00:00 |
|
yflory
|
fc91cf606b
|
Disable moveToTrash button for pads in shared folders
|
2018-07-16 18:05:23 +02:00 |
|
ansuz
|
8a18698c03
|
initialize newly registered users with a v2 drive hash
|
2018-07-16 17:08:35 +02:00 |
|
ansuz
|
ed881840cd
|
remove XXX label from non-blocking feature
|
2018-07-16 17:08:16 +02:00 |
|
ansuz
|
05a41ad7f1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-07-16 16:51:12 +02:00 |
|
ansuz
|
7348eca1d5
|
revise english translations which have been marked for review
|
2018-07-16 16:51:06 +02:00 |
|
yflory
|
930bd32f70
|
lint compliance
|
2018-07-16 16:44:25 +02:00 |
|
yflory
|
3830935dd9
|
French translation
|
2018-07-16 16:43:45 +02:00 |
|
yflory
|
9c58dc216f
|
Remove option to move a shared folder to the trash
|
2018-07-16 16:17:34 +02:00 |
|
ansuz
|
2c22232a47
|
check if a user is logged in strictly by User_hash
|
2018-07-16 15:45:45 +02:00 |
|
ansuz
|
848a918eda
|
remove out of date comments
|
2018-07-16 15:45:19 +02:00 |
|
yflory
|
668b7425a8
|
Make sure we won't move pads from a shared folder to the trash
|
2018-07-16 15:39:34 +02:00 |
|
yflory
|
5b48eff78c
|
Remove owned pads deleted from the server in shared folders
|
2018-07-16 14:05:36 +02:00 |
|
ansuz
|
8e2ab0b74a
|
bump version strings
|
2018-07-16 11:30:57 +02:00 |
|
ansuz
|
b9c4aa43b5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-07-16 11:25:11 +02:00 |
|
ansuz
|
3d95e6088a
|
leave a FIXME note
|
2018-07-16 11:24:58 +02:00 |
|