ansuz
|
912a9d569c
|
Merge branch 'revised-german' into soon
|
2018-08-07 12:03:21 +02:00 |
|
ansuz
|
a773e0c44c
|
Merge pull request #265 from atallahade/fix-typo
Fix an anchor link in the readme file
|
2018-08-07 11:54:56 +02:00 |
|
ansuz
|
88c43cfc5c
|
address a linter error
|
2018-08-07 11:45:22 +02:00 |
|
ansuz
|
dc122e424c
|
Merge branch 'master' into soon
|
2018-08-07 11:41:37 +02:00 |
|
ansuz
|
24c7ce57e1
|
apply the fix for password change recommended by @sairim
|
2018-08-07 11:40:21 +02:00 |
|
Paul Libbrecht
|
365d17e275
|
Merge branch 'master' into revised-german
|
2018-08-03 18:01:16 +02:00 |
|
Adel Atallah
|
6d4cf50fa8
|
Fix typo
|
2018-08-01 21:53:03 +02:00 |
|
Adel Atallah
|
3026a1bf9b
|
Fix an anchor link in the readme file
|
2018-07-30 22:14:43 +02:00 |
|
ansuz
|
0769452f04
|
Merge branch 'soon'
|
2018-07-18 16:01:52 +02:00 |
|
ansuz
|
7004f26730
|
update documentation
|
2018-07-18 16:01:27 +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
|
f97685cc15
|
lint compliance
|
2018-07-18 15:12:07 +02:00 |
|
yflory
|
8eccffd8e4
|
Don't remove migrated read-only pads
|
2018-07-18 14:56:49 +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 |
|
ansuz
|
1629d7bb1d
|
provide a SANE default in case httpUnsafeOrigin is not provided
|
2018-07-17 16:31:15 +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 |
|
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
|
ecb9f039b1
|
Fix pad password change not reloading with the correct URL
|
2018-07-17 12:27:23 +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 |
|
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 |
|
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 |
|
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 |
|
ansuz
|
adc54434fd
|
update english translation as prompted by german translation PR
|
2018-07-16 11:24:18 +02:00 |
|
Caleb James DeLisle
|
792f7bcc64
|
show how long less takes to compile
|
2018-07-14 15:21:45 +02:00 |
|
Caleb James DeLisle
|
c5105d7b84
|
Merge branch 'check-for-css-variables' into staging
|
2018-07-12 17:16:21 +02:00 |
|
Caleb James DeLisle
|
a440359bc7
|
Commit patches provided to me by someone who Seemed Trustworthy At The Time
(should fix false negatives in shared-worker detection)
|
2018-07-12 16:59:36 +02:00 |