Commit graph

234 commits

Author SHA1 Message Date
yflory
7b06626581 Merge branch 'autostore' into staging 2018-08-30 10:26:19 +02:00
yflory
b1f2d287b4 Add warning for chrome 68 users on Mac 2018-08-28 17:44:15 +02:00
yflory
d201e9a0cd Disable some toolbar features not available if the pad is not stored 2018-08-28 12:12:47 +02:00
yflory
e8a5244362 Autostore base 2018-08-27 14:58:09 +02:00
yflory
e0b7f3f965 When importing a shared folder to the drive, open this folder directly 2018-08-23 11:55:14 +02:00
yflory
20a9eee719 Disable shared folders creation by default 2018-07-20 18:41:14 +02:00
yflory
4325ed4dde Fix small UI issues in drive 2018-07-20 12:29:18 +02:00
yflory
bad1d7311a Fix drive tests 2018-07-20 12:04:42 +02:00
yflory
2be78deb93 Fix Drive history 2018-07-19 17:07:14 +02:00
yflory
aafcb1bc02 Merge branch 'sharedfolder' into staging 2018-07-18 14:18:30 +02:00
yflory
fc91cf606b Disable moveToTrash button for pads in shared folders 2018-07-16 18:05:23 +02:00
yflory
a99e5a3aaa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-02 11:03:58 +02:00
yflory
27797c0520 Fix undefined secret with password-protected files (#250) 2018-07-02 10:50:30 +02:00
yflory
a146f6acc9 Change user account password function 2018-06-22 10:37:54 +02:00
yflory
36d1ae0f6c Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users 2018-06-20 16:39:52 +02:00
yflory
71b085ba23 Owned drive migration UI 2018-06-20 16:39:01 +02:00
ansuz
c3741f847d resolve conflicts from merge with staging 2018-06-20 14:29:13 +02:00
ansuz
cb5fa72dba implement removeLoginBlock rpc 2018-06-19 17:17:56 +02:00
yflory
29f577dfc6 Improve history to load it chunk by chunk 2018-06-19 17:02:16 +02:00
yflory
d37aa0646e Change account password (clientside RPC) 2018-06-14 18:18:53 +02:00
yflory
54d63df1cf Ability to change the password of a pad 2018-06-14 17:18:32 +02:00
yflory
4896fe81fe Merge branch 'serviceworker' into staging 2018-06-12 18:24:19 +02:00
yflory
089e0361b6 Detect new version 2018-06-11 16:52:26 +02:00
yflory
e39c77e162 Merge branch 'staging' into serviceworker 2018-06-11 10:59:01 +02:00
yflory
921e6eb3c3 Fix wrong pad title in drive 2018-06-11 10:58:44 +02:00
yflory
b0311ccec1 Don't create file duplicates in the drive 2018-06-01 12:10:49 +02:00
yflory
21366c252d Merge branch 'donkey' into staging 2018-06-01 12:07:10 +02:00
yflory
cc163f83c7 Fix an issue creating duplicate files in the drive 2018-06-01 10:52:54 +02:00
yflory
b9f5a0f52b Move async store in a webworker! 2018-05-31 18:22:16 +02:00
yflory
a6bac8ae41 Fix password prompt issue when the password was wrong in the file app 2018-05-28 18:18:25 +02:00
ansuz
2170fcb9ad Merge branch 'kanban' into staging 2018-05-18 10:19:55 +02:00
yflory
ef735d6fe6 Fix an issue when trying to create a pad with a password from a template 2018-05-17 18:15:10 +02:00
yflory
65a2083afc Suggest tags based on existing ones. Display existing tags in the drive. 2018-05-15 18:18:56 +02:00
yflory
2d2701596a Loading message and loading bar for migration 2018-05-04 18:41:54 +02:00
yflory
64c85fe548 Don't return channel in parsePadUrl 2018-04-27 17:23:23 +02:00
yflory
43d046406f Store the channel id as pad attribute 2018-04-27 11:54:23 +02:00
yflory
b26ae67df5 Fix issues with channel ID when using a password 2018-04-26 15:10:31 +02:00
yflory
1879c1829c Add passwod prompt to access protected pads 2018-04-25 19:03:58 +02:00
yflory
811463b870 Add support for version 2 hashes needed for password-protected pads 2018-04-24 17:22:33 +02:00
yflory
9f5e5786f3 Merge branch 'pcs' into staging 2018-04-19 11:14:56 +02:00
yflory
206ac14438 Prevent users from creating a pad when visiting a deleted profile (read-only mode) 2018-04-18 18:54:46 +02:00
yflory
ec0fc85b9f Sort templates by usage in the PCS 2018-04-13 18:52:55 +02:00
yflory
e1473dff79 Fix tests 2018-04-10 16:38:31 +02:00
yflory
e37aab492b Validate messages not coming from history-keeper 2018-04-10 15:10:28 +02:00
ansuz
b323989347 remove extraneous console statements 2018-04-04 14:49:33 +02:00
yflory
db9eee383c Owned profile 2018-03-22 15:16:19 +01:00
yflory
a718603b36 Automatic account deletion 2018-03-21 18:27:20 +01:00
ansuz
a794efe931 Merge branch 'staging' into oo 2018-03-21 11:32:59 +01:00
yflory
c9ed6d6bf8 New pad creation screen 2018-03-13 11:31:08 +01:00
ansuz
7944bc1a82 merge staging branch 2018-03-09 12:08:18 +01:00
yflory
5c53868c3b Delete pads after 3 months of inactivity 2018-02-26 18:34:05 +01:00
yflory
61dbf94f2d Fix pad attributes not working for readonly pads if you know the edit hash 2018-02-22 15:56:23 +01:00
yflory
7ff9bbe2b0 Fix share modal with new pads 2018-02-22 12:43:16 +01:00
yflory
5c1e5a3f49 Merge branch 'staging' into oo 2018-02-19 12:11:06 +01:00
yflory
037a6ccc35 Fix INVALID_RESPONSE error in the file app 2018-02-16 12:02:20 +01:00
yflory
bdafc101c9 Ability to remove owned channels from the drive 2018-01-29 15:17:53 +01:00
yflory
5827905dbd Import OnlyOffice code from the 'onlyoffice' branch and sframe it 2018-01-25 11:06:58 +01:00
yflory
a4b35728dc Todo app has a hash in the omnibar 2018-01-12 17:08:41 +01:00
yflory
daef08a9b3 Add an advanced new pad modal 2018-01-12 09:50:11 +01:00
yflory
8c9490868b improve owned pads management in the drive 2018-01-10 17:57:40 +01:00
yflory
071d385850 Remove an unnecessary websocket connection 2018-01-09 12:02:22 +01:00
yflory
0cea5f4596 Create an owned pad and view owned pads in the drive 2018-01-08 17:36:44 +01:00
ansuz
869909b101 implement more reliable check for whether a channel on the server is new 2017-12-22 16:24:17 +01:00
ansuz
b6430d640e temporary measure to address infinite reload loop due to inaccurate inNewFile condition 2017-12-22 14:59:41 +01:00
ansuz
d1d75f2f25 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-21 15:53:16 +01:00
yflory
c18d4297e1 Fix friend requests from the userlist 2017-12-15 16:19:22 +01:00
Caleb James DeLisle
6ac4fa4689 wip 2017-12-14 11:34:44 +01:00
yflory
6bcc72ff83 Fix pads using an old URL 2017-12-12 14:45:25 +01:00
yflory
a863011a0c Fix profile in read-only mode 2017-12-12 12:14:32 +01:00
yflory
b1765c6ae3 Fix pad creation screen with anonymous users 2017-12-11 17:58:59 +01:00
yflory
c269929319 Fix creation page not displayed in pad and slide 2017-12-11 17:17:06 +01:00
yflory
362104ec09 lint compliance 2017-12-11 14:49:41 +01:00
yflory
1922dbfd75 Creation page with mobile support 2017-12-11 12:19:44 +01:00
yflory
e96d54e655 Add a pad creation page 2017-12-07 18:51:50 +01:00
yflory
9eb33e39e6 Enable change events in the drive 2017-12-05 18:09:43 +01:00
yflory
17636769e4 Remove the second network created for the drive 2017-12-05 16:40:04 +01:00
yflory
52712c4bb9 Use the network from the async store for pads 2017-12-04 19:16:38 +01:00
yflory
4903bd0757 Enable messenger in async store 2017-12-01 14:49:21 +01:00
yflory
bd85f1b003 Fix file upload and remove unnecessary dependencies 2017-12-01 10:16:48 +01:00
yflory
664625a6ef Fix more async store issues 2017-11-30 18:22:26 +01:00
yflory
5c3237e093 Fix issues with the async store 2017-11-30 17:21:58 +01:00
yflory
b3688db202 Use async store 2017-11-30 15:01:17 +01:00
yflory
0840570fbf Async store part 1 2017-11-30 10:33:09 +01:00
yflory
280a7c2765 Clean cryptpad-common 2017-11-23 12:28:49 +01:00
ansuz
585f9d2e4e repair broken 'clear channel' button 2017-11-21 17:19:35 +01:00
yflory
7f88d1d43a Improve drive loading speed 2017-11-21 11:09:59 +01:00
yflory
a96e49d55a Fix filepicker creating a new netflux network when initialized 2017-11-15 16:56:50 +01:00
yflory
7cfe64fc5b Remove cryptpad-common dependency for some inner apps 2017-11-13 18:09:19 +01:00
yflory
1514ad5df3 Move the 'logged out' screen inside the sframe 2017-11-13 17:29:00 +01:00
yflory
5a2afb5c95 Remove Realtime and Messaging from common 2017-11-13 17:01:09 +01:00
yflory
30c8c253dd Remove util and hash from common 2017-11-13 16:32:40 +01:00
yflory
c9e1de042c Remove common-interface dependency from cryptpad-common 2017-11-13 12:00:26 +01:00
yflory
354c63bd64 Clean old code 2017-11-09 18:17:49 +01:00
yflory
101482b8cc Migrate settings to use a sandboxed iframe 2017-11-09 14:23:40 +01:00
yflory
6b9ffe8dd1 Make thumbnails more secure 2017-11-07 14:51:53 +01:00
yflory
2a3a5c4342 Ability to disable thumbnails 2017-11-03 18:38:27 +01:00
ansuz
288e141c1f add missing sframe method 2017-10-23 12:33:50 +02:00
yflory
c25be21138 Fix the upgrade button in the drive 2017-10-20 10:16:01 +02:00
yflory
6926d42292 Autoload template picker to make it faster to appear when used 2017-10-12 18:18:01 +02:00
yflory
95ad25973e Ability to delete a stronger pad from readonly mode 2017-10-12 11:41:53 +02:00
yflory
b28c1537e8 Fix history in readonly mode 2017-10-12 10:59:23 +02:00
yflory
ab3648a30a Merge branch 'newpoll' into staging 2017-10-05 17:56:17 +02:00
ansuz
d85db64939 add tags from drive 2017-10-05 16:58:34 +02:00
yflory
5cf86bf74a Update UI in poll and remove old code 2017-10-03 14:11:11 +02:00
ansuz
09c0a473e2 fix function signatures 2017-10-03 14:08:40 +02:00
ansuz
351b95d6a9 resolve merge conflicts 2017-10-02 18:59:47 +02:00
ansuz
6c7b135f91 lint compliance 2017-10-02 18:58:18 +02:00
ansuz
94c392b79f secure messaging 2017-10-02 18:57:17 +02:00
yflory
cdeac00633 Merge branch 'staging' into newdrive 2017-09-25 17:35:06 +02:00
yflory
4049931924 Lint 2017-09-25 11:51:24 +02:00
yflory
47fe7b1c53 Drive in sandboxed iframe 2017-09-22 19:35:06 +02:00
yflory
dfdeb7b113 Fix style and race condition for history mode 2017-09-21 18:00:33 +02:00
yflory
a810d7bd85 Fix style and race condition for history mode 2017-09-21 18:00:11 +02:00
yflory
456370b1aa Base for Drive in sandboxed iframe 2017-09-21 17:59:26 +02:00
yflory
8a09e39f46 Enable tags in pads 2017-09-19 15:30:08 +02:00
yflory
1131ef0172 Fix language selection in sandboxed iframes 2017-09-18 14:26:54 +02:00
Caleb James DeLisle
8a32b72ffc 1. implement cryptpadCache which has put() and get() functions that can be used like a localStorage that auto-flushes when a new version is released
2. change loading.js to use packaged css in order to get the loading screen up as quick as possible.
3. change LessLoader to cache less in cryptpadCache
2017-09-14 10:23:05 +02:00
yflory
437f50fd4a Migrate the file to a sandboxed iframe 2017-09-12 18:40:11 +02:00
Caleb James DeLisle
041071e61c manual merge 2017-09-11 15:52:14 +02:00
Caleb James DeLisle
7334173b4a Hopefully fix infinite spinner whenever there is a disconnect (pad) 2017-09-11 15:46:21 +02:00
yflory
514bff7065 Add slide number in the title in slide2 2017-09-08 18:21:11 +02:00
yflory
c3a07e879c Merge branch 'staging' into slide2 2017-09-08 16:23:07 +02:00
yflory
fc069dac48 Ask the user before loading the template picker 2017-09-08 16:21:12 +02:00
yflory
290d668ceb Fix race condition preventing slide to work on Edge 2017-09-08 15:53:53 +02:00
yflory
f2aaaa9751 Move slide to secure iframe 2017-09-07 18:56:58 +02:00
yflory
04a04aef2b Add setAttribute/getAttribute in secure iframes. Store attributes in settings 2017-09-06 16:05:20 +02:00
yflory
e85b34f127 Add embed options in the secure pad hashes 2017-09-05 18:38:51 +02:00
yflory
53eb9bb541 Remove the logo from the filepicker loading screen 2017-09-05 15:34:38 +02:00
yflory
d2787e3eff Make code2 the default code app 2017-09-05 11:36:02 +02:00
yflory
f12f4bb925 Integrate filepicker secure iframe in the code2 app 2017-09-01 15:17:14 +02:00
yflory
89b7b644f3 Enable drag & upload in code2 and prepare filepicker 2017-08-31 16:32:26 +02:00
yflory
b8971cdc23 Add previewMode settings to code2 2017-08-30 18:47:50 +02:00
yflory
0d008aaa2e Add indent settings to code2 2017-08-30 17:57:10 +02:00
yflory
a2ed266048 Move the code app in a secure iframe 2017-08-30 11:10:57 +02:00