ansuz
|
6922bc1e08
|
lint compliance
|
2018-07-19 11:14:52 +02:00 |
|
ansuz
|
fcc54a3c34
|
Merge branch 'docker-fix-rename' into staging
|
2018-07-19 10:33:23 +02:00 |
|
ansuz
|
a090dc52db
|
flow compliance
|
2018-07-19 10:33:01 +02:00 |
|
Caleb James DeLisle
|
5527949c70
|
Make LessLoader flow properly, sorry about that
|
2018-07-18 16:22:44 +02:00 |
|
ansuz
|
a181c09a68
|
Merge branch 'soon' into staging
|
2018-07-18 15:56:44 +02:00 |
|
ansuz
|
58332a9ce3
|
add french translation for password change loading screen
|
2018-07-18 15:56:13 +02:00 |
|
ansuz
|
c1eb6d6a01
|
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
|
2018-07-18 15:53:26 +02:00 |
|
ansuz
|
e2600e4b36
|
display a loading screen while users are changing their passwords
|
2018-07-18 15:53:12 +02:00 |
|
yflory
|
ebce0024d7
|
Merge branch 'soon' into staging
|
2018-07-18 15:13:58 +02:00 |
|
yflory
|
f97685cc15
|
lint compliance
|
2018-07-18 15:12:07 +02:00 |
|
yflory
|
ef73cf89cd
|
Merge branch 'soon' into staging
|
2018-07-18 15:10:23 +02:00 |
|
yflory
|
8eccffd8e4
|
Don't remove migrated read-only pads
|
2018-07-18 14:56:49 +02:00 |
|
yflory
|
36480cf746
|
New default app colors
|
2018-07-18 14:50:05 +02:00 |
|
yflory
|
2b1ed904f7
|
lesshint compliance
|
2018-07-18 14:31:01 +02:00 |
|
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 |
|
mcrosson
|
3a6f7d9b36
|
Fixup docker rename calls (addresses #244)
|
2018-07-16 17:02:55 +00:00 |
|