Commit Graph

8742 Commits (36e790dee6501b2e49097874eb7134cdb5eb85eb)

Author SHA1 Message Date
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
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
ansuz adc54434fd update english translation as prompted by german translation PR 2018-07-16 11:24:18 +02:00
Caleb James DeLisle cf87d70a8f manual merge of staging (actually nothing from staging should be kept) 2018-07-14 15:22:48 +02:00
Caleb James DeLisle 792f7bcc64 show how long less takes to compile 2018-07-14 15:21:45 +02:00
Caleb James DeLisle 6c49318ac7 Show how long it takes to parse less 2018-07-14 15:19:39 +02:00
Caleb James DeLisle 0d5ac05866 refactoring of the less infrastructure 2018-07-14 15:15:23 +02:00
yflory b5c2eb8a9c Automatically refresh the drive when a change occurs in a shared folder 2018-07-13 19:24:49 +02:00
yflory 4706b8a9de Store newly created pads in the correct (shared) folder 2018-07-13 15:01:23 +02:00
yflory 6a80f49fe0 Don't load expired or deleted shared folders 2018-07-13 14:47:53 +02:00
Caleb James DeLisle 507e5b18e9 Remove all less includes where no mixin or variable is used after 2018-07-12 19:22:32 +02:00
Caleb James DeLisle a6d3dbf94f Wrapped modal.less into a mixin which gets rid of the last file which emitted CSS 2018-07-12 19:13:04 +02:00
Caleb James DeLisle 4a352f2ed8 Use import (reference) whenever the less file supposedly emits no CSS 2018-07-12 18:43:17 +02:00
yflory 7d89026d83 Fix more issues with shared folders 2018-07-12 17:27:16 +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