5560 Commits

Author SHA1 Message Date
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
Caleb James DeLisle
cb8888ea1a Yes, so it turns out that making a small asthetic change after testing on every browser does actually break it :| 2018-07-12 16:51:48 +02:00
Caleb James DeLisle
fabdbc3b61 Add a feedback test for checking for CSS variables, so we won't use a feature which is not implemented by the vast majority of the people using CryptPad... 2018-07-12 16:02:46 +02:00
yflory
8516587ece lint compliance 2018-07-11 15:28:34 +02:00
yflory
9787f5304a Don't unpin channels that are still in another proxy 2018-07-11 15:28:24 +02:00
ansuz
3fb6cb3d00 lint compliance 2018-07-11 11:35:44 +02:00
ansuz
ca409e5eaa support import/export in kanban 2018-07-11 10:50:42 +02:00
ilu33
9b37d58f95
Total revision of german translation
Corrected lots of typos, grammar and incomprehensible (machine?) translation. Things can still be improved but at least most of the strangeness should be gone. I also added all strings from messages.js that were not included before.

Somebody needs to check that I did not mess up code/formatting.
2018-07-11 08:03:42 +02:00
yflory
321c7d5512 Move pin/unpin outside of userObject 2018-07-10 18:23:16 +02:00
ansuz
1d8943e673 support deprecation of non-owned drives 2018-07-10 18:09:33 +02:00
ansuz
8574128efd unstub password change function 2018-07-10 16:44:24 +02:00
ansuz
25b0d764ed pass initialState variable when copying your drive in the changeUserPassword function
because the hardest problems to debug are always fixed with one line changes
2018-07-10 16:42:11 +02:00
ansuz
54bc29f28c WIP maybe I missed something 2018-07-10 15:16:43 +02:00
yflory
66a494cbd2 temp 2018-07-10 15:10:07 +02:00
yflory
4b86ed2dec Shared folders UI 2018-07-10 14:41:37 +02:00
ansuz
0a9ea95796 always set userHash in localStorage even with modern users 2018-07-10 13:11:22 +02:00
yflory
bc7524c134 Fix tippy 2018-07-10 10:39:21 +02:00
yflory
6312dadb60 Fix shared folders names in the drive 2018-07-09 18:11:04 +02:00
ansuz
ce7ebf0326 don't stop users from registering if they cancel out of a prompt 2018-07-09 15:31:20 +02:00
yflory
e0cc1a6eb6 Display a shared folder in the drive 2018-07-09 14:36:55 +02:00
ansuz
16f276a18c fix anon pad import 2018-07-09 14:34:33 +02:00
ansuz
a15e232469 complete modern user registration/login. general cleanup 2018-07-09 14:20:38 +02:00
ansuz
3d4b693722 use correctly scoped variable 2018-07-06 11:54:01 +02:00
ansuz
d79064a4c5 Merge branch 'staging' into modern-users2 2018-07-06 11:37:50 +02:00
ansuz
4ef2cfa88d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-06 11:37:00 +02:00
ansuz
57a39258c3 WIP big commit 2018-07-06 11:36:48 +02:00
ansuz
0c3b898000 simple one line fixes 2018-07-06 10:28:41 +02:00
yflory
0c9dfc1fb5 Add proxy manager inner 2018-07-05 16:33:46 +02:00
yflory
bd6a199dca Add missing functions to the proxy manager 2018-07-05 13:56:16 +02:00
yflory
a25a72b5db Add a proxy manager to handle operations between shared folders 2018-07-05 10:37:06 +02:00
ansuz
ab04a7cb46 fix the bug I caused while trying to silence the linter 2018-07-02 17:43:39 +02:00
yflory
66591a3654 Merge branch 'rohref' into sharedfolder 2018-07-02 14:12:06 +02:00
yflory
846755b0a7 Increase requirejs timeout (thanks Firefox...) 2018-07-02 14:02:05 +02:00