Commit Graph

51 Commits (5fbbaee2f5f435404780c686b130eeb89e5a8575)

Author SHA1 Message Date
Caleb James DeLisle e62faf7c7b Edge fix, always use async iframe onLoad rather than invoking it manually 2017-08-28 11:22:57 +02:00
Caleb James DeLisle 0a6f81850f Handle infinite-spinner errors and properly inform the user 2017-08-25 14:24:43 +02:00
Caleb James DeLisle 7bbea28831 minor anti-xss changes... 2017-08-24 13:53:42 +02:00
Caleb James DeLisle dc283c2d74 Load 1, load 2... not load 1, load 3. 2017-08-23 15:49:51 +02:00
Caleb James DeLisle cbac5e417c Make loading screen come much earlier on pad2 2017-08-23 12:14:51 +02:00
Caleb James DeLisle acfaaa7d56 jshint compliance 2017-08-23 11:04:44 +02:00
yflory 33025a9df9 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-22 18:19:06 +02:00
yflory c33b128bf4 Enable feedback in pad2 2017-08-22 18:18:58 +02:00
Caleb James DeLisle d9f5e3638e Big caching improvements :D 2017-08-22 15:50:10 +02:00
Caleb James DeLisle 4f3b4a30ee Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-21 18:38:16 +02:00
Caleb James DeLisle 4b70fc9f49 Use resources from the original origin in pad2 2017-08-21 18:38:07 +02:00
yflory 20a68ad71c Hide the template button if the pad2 is a template 2017-08-21 18:31:15 +02:00
yflory 4089803785 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-21 18:22:08 +02:00
yflory f40d2c0b20 Add templates to pad2 2017-08-21 18:21:53 +02:00
Caleb James DeLisle bffa4d01a8 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-21 18:08:46 +02:00
Caleb James DeLisle b081603455 Update requirejs 2017-08-21 18:08:37 +02:00
yflory 8d837d22ea Add history to pad2 2017-08-21 17:40:21 +02:00
yflory b2e6df1f9d Add import & export in pad2 2017-08-21 15:34:21 +02:00
yflory 1da11a1883 Disable edition in readonly mode in pad2 2017-08-21 15:30:48 +02:00
yflory e2d39de143 Forget button in pad2 2017-08-21 15:20:38 +02:00
yflory e4020ba8d4 Fix pad creation in pad2 2017-08-21 14:41:56 +02:00
yflory 140c6f3776 Add limit warning in pad2 2017-08-21 12:24:33 +02:00
yflory 30aef71603 Enable avatars in pad2 2017-08-21 12:01:38 +02:00
Caleb James DeLisle 6dd1643738 Manual merge work done on loading page to pad2 2017-08-21 10:53:40 +02:00
Caleb James DeLisle 8b702e0150 wip 2017-08-21 10:34:49 +02:00
yflory e65b2f4e9f Add shareButton to pad2 2017-08-18 18:43:04 +02:00
yflory 90f892de9c Useradmin menu, notifications and share button in pad2 2017-08-18 16:34:41 +02:00
yflory dd9b38066e Change display name in useradmin menu 2017-08-18 11:07:42 +02:00
yflory a96d447e8b Add notifications in pad2 2017-08-18 10:47:30 +02:00
Caleb James DeLisle cf6d8c83b2 Fix title setter logic and separate it from UI 2017-08-17 19:58:48 +02:00
Caleb James DeLisle ec87f3f897 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-17 19:01:40 +02:00
Caleb James DeLisle 415399ef64 Changes to support title change in metadata 2017-08-17 19:01:33 +02:00
yflory d1affebd14 Title in pad2 2017-08-17 19:01:03 +02:00
yflory 604415b32c Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-17 18:29:24 +02:00
yflory fab3d67b75 Enable title in pad2 2017-08-17 18:28:05 +02:00
Caleb James DeLisle 2490ee253f Added setDisplayName RPC 2017-08-17 18:09:17 +02:00
Caleb James DeLisle 0b34ceb0eb Added RPC setPadTitleInDrive() 2017-08-17 17:34:08 +02:00
Caleb James DeLisle 3b5af3ea74 sframe common changes 2017-08-17 16:56:18 +02:00
yflory f5855a2870 Add account name in metadata manager 2017-08-17 16:25:25 +02:00
yflory d88704fb50 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-17 15:44:41 +02:00
Caleb James DeLisle a4850a7fcc Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-17 15:42:28 +02:00
yflory fc5bdd3bed Add lazy metadata to fix parse errors in pad2 2017-08-17 15:42:26 +02:00
Caleb James DeLisle ad9f2ff223 Made pad2 server more generic and easy to implement 2017-08-17 15:41:04 +02:00
yflory fb512c8923 Toolbar in pad2 2017-08-17 14:55:44 +02:00
Caleb James DeLisle 4acd9957a9 Set the url if there is none 2017-08-11 10:40:57 +02:00
Caleb James DeLisle 33e73dd5e5 fixed one last fight 2017-08-10 21:40:34 +02:00
Caleb James DeLisle 1e56fa31c0 yay, they talk and they don't fight 2017-08-10 18:31:44 +02:00
Caleb James DeLisle 0dde1d7507 wip 2017-08-10 14:49:21 +02:00
Caleb James DeLisle c304071492 wip 2017-08-09 17:37:55 +02:00
Caleb James DeLisle 4b25ab80d6 wip 2017-08-09 14:45:39 +02:00