Commit Graph
100 Commits
Author SHA1 Message Date
yflory f590f60dcb Fix transfer ownership to a team 2020-01-06 17:51:40 +01:00
yflory eb85a5908e Fix pad type in search for read-only pads 2020-01-06 17:05:29 +01:00
yflory 080ffa09a6 Fix 'team is undefined' error 2020-01-06 10:43:04 +01:00
yflory 72e308994d Fix scrollbar in support's textarea 2019-12-23 15:46:16 +01:00
yflory c2c5dbdb64 Remove hash when joining a team with a link 2019-12-20 15:48:29 +01:00
yflory 89d9f22e0e Merge branch 'staging' into soon 2019-12-20 14:48:40 +01:00
yflory a461733aa1 Fix team invitation with no contact 2019-12-20 14:33:28 +01:00
yflory 3be7a387b4 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2019-12-20 14:28:44 +01:00
yflory 4db16faac0 Catch href decryption errors 2019-12-20 14:26:34 +01:00
yflory 8a6713e552 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI 2019-12-19 16:21:35 +01:00
yflory 826a86c7d6 Fix joining your own team 2019-12-19 16:21:10 +01:00
yflory 361292ff01 Fix button width in profile 2019-12-19 15:37:09 +01:00
yflory 20aeb0fde6 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI 2019-12-19 11:56:31 +01:00
yflory 4869b4e0c3 Delete invitation after using it 2019-12-19 11:56:20 +01:00
yflory aca9ddca06 Display error message when trying to use an invitation link a second time 2019-12-19 11:45:50 +01:00
yflory 0dc4a1d890 Display error message when using an invalid invitation link 2019-12-19 11:38:09 +01:00
yflory de5feeda13 Remove some tippy titles 2019-12-19 11:27:41 +01:00
yflory 262ccf1265 Merge branch 'staging' into inviteUI 2019-12-19 11:08:26 +01:00
yflory 3bebab57e4 Remove XXX 2019-12-19 10:54:58 +01:00
yflory bfc519331b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-12-19 10:35:38 +01:00
yflory d2ba375491 Improve profile UI 2019-12-19 10:34:08 +01:00
yflory 9ad2bf2bd6 lint compliance 2019-12-18 19:11:35 +01:00
yflory e0782d753d Fix conflicting curvePublic 2019-12-18 19:10:30 +01:00
yflory 3cd93b1d52 Fix UI issue 2019-12-18 18:47:08 +01:00
yflory 186487cbda Fix cryptput issues 2019-12-18 18:45:17 +01:00
yflory 8c09e7d43c Merge branch 'staging' into inviteUI 2019-12-18 18:26:41 +01:00
yflory a518cbcce7 Fix translation keys 2019-12-18 18:26:25 +01:00
yflory b402b3c552 Add wrong password handler 2019-12-18 18:25:44 +01:00
yflory 0b6539893b Fix missing curvePublic 2019-12-18 18:17:05 +01:00
yflory 62c6765c21 Merge branch 'staging' into inviteUI 2019-12-18 18:14:10 +01:00
yflory 4d1079e1e2 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI 2019-12-18 18:11:12 +01:00
yflory 994eefaf63 Merge branch 'staging' into inviteUI 2019-12-18 18:10:50 +01:00
yflory 25b88afeea Fix invitation links 2019-12-18 18:10:33 +01:00
yflory f98543bb83 Add category icon for link invitation 2019-12-18 18:02:33 +01:00
yflory 7008c71605 Clean teams inner code 2019-12-18 17:46:44 +01:00
yflory 6945628cf1 handle error in team outer 2019-12-18 17:45:57 +01:00
yflory 97f322753a Add owners to invitation channels 2019-12-18 17:12:29 +01:00
yflory 32fd1b4971 remove debugging console.error 2019-12-18 17:00:38 +01:00
yflory 1826d05e31 Keep cloned data when accepting team invitation 2019-12-18 16:58:02 +01:00
yflory 7db7db262c Fix 'enter' key in team invite modal 2019-12-18 16:36:06 +01:00
yflory 563e2161c3 Merge branch 'staging' into inviteUI 2019-12-18 16:23:15 +01:00
yflory 032186cc4c Fix unsanitized name in profile again 2019-12-18 16:15:33 +01:00
yflory 704d42d169 Fix unsanitized name in profile 2019-12-18 16:08:22 +01:00
yflory e6e1ef72e7 Merge branch 'staging' into inviteUI 2019-12-18 15:12:43 +01:00
yflory a34aad78ab Remove duplicate code 2019-12-18 15:12:33 +01:00
yflory a817242fe5 Fix join team for anon users 2019-12-18 13:05:01 +01:00
yflory 8eed376274 Fix default category after joining a team 2019-12-18 12:42:24 +01:00
yflory efa56e5fbc lint compliance 2019-12-18 12:32:13 +01:00
yflory 404f5fb4da Handle max teams slots with link invitation 2019-12-18 12:29:39 +01:00
yflory fc8ee58cfb Fix joinTeam undefined data 2019-12-18 12:09:41 +01:00
yflory b58901e229 Fix link generation 2019-12-18 12:04:36 +01:00
yflory 0574bd9286 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI 2019-12-18 11:37:21 +01:00
yflory a5f88c505d lint compliance 2019-12-18 11:37:17 +01:00
yflory 400b39d46a Join a team from a link 2019-12-18 11:35:39 +01:00
yflory 3d1b3b5d18 Fix RPC data 2019-12-18 10:52:20 +01:00
yflory 906b315487 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI 2019-12-18 10:42:03 +01:00
yflory fc651747ca Fix error message not displayed when creating a invitation link 2019-12-18 10:38:30 +01:00
yflory 5b8eb1c070 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-12-17 17:57:28 +01:00
yflory 215cabc053 Fix sidebar layout buttons in team drive 2019-12-17 17:57:07 +01:00
yflory 790c9aa0d7 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI 2019-12-17 17:28:31 +01:00
yflory cf2a624775 Add 'Join team' and 'Decline' buttons 2019-12-17 17:28:19 +01:00
yflory d9ae669015 Handle deleted invitation error 2019-12-17 17:18:45 +01:00
yflory 55baf4ab29 Merge branch 'sidebarbuttons' of github.com:xwiki-labs/cryptpad into sidebarbuttons 2019-12-17 17:04:04 +01:00
yflory 4cc2da7222 Fix HTML message displayed as text in profile 2019-12-17 17:03:56 +01:00
yflory 0b248348eb Fix mute/unmute button in contacts 2019-12-17 17:01:15 +01:00
yflory 64fba3e379 Merge branch 'mute' into sidebarbuttons 2019-12-17 14:28:37 +01:00
yflory 55acf9d4a0 Merge branch 'staging' into mute 2019-12-17 14:28:23 +01:00
yflory 3aa111d8a8 lint compliance 2019-12-17 11:49:32 +01:00
yflory 5174472329 Fix link generation bug 2019-12-17 11:48:23 +01:00
yflory 6a712a7b52 View pending invitation links and remove them (if admin) 2019-12-17 11:24:49 +01:00
yflory 35dbfe0bb5 Pin the invitation link channels 2019-12-17 11:17:31 +01:00
yflory 5a055233c0 Fix cryptget inner 2019-12-17 10:57:13 +01:00
yflory e38d6d1093 Fix link generation 2019-12-17 10:29:02 +01:00
yflory 495cb4403b Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI 2019-12-16 18:37:53 +01:00
yflory 0716014eef Refactoring joining team from link 2019-12-16 18:36:34 +01:00
yflory 4626d036cb Cryptget in common/invitation 2019-12-16 17:12:58 +01:00
yflory cfb6318b86 Team invitation link, add alert 2019-12-16 16:06:22 +01:00
yflory 07ef60418b Merge branch 'mute' into sidebarbuttons 2019-12-16 14:46:36 +01:00
yflory 47128802a2 Merge branch 'staging' into mute 2019-12-16 14:43:14 +01:00
yflory b5193914e3 Add mute info in the profile app 2019-12-16 14:17:40 +01:00
yflory f64c11dc3a Fix profile app 2019-12-16 14:12:33 +01:00
yflory 7f5c5c18a3 Merge branch 'mute' into sidebarbuttons 2019-12-16 13:58:21 +01:00
yflory ac5100b3b2 Update mute icon in profile 2019-12-16 13:57:49 +01:00
yflory 0ee6fcb6bc Add unmute contacts button 2019-12-16 13:09:52 +01:00
yflory 9e08a97d72 Alertify buttons and inputs added to sidebar layout 2019-12-16 12:51:12 +01:00
yflory fb8be19657 Fix buttons UI in contacts 2019-12-13 18:43:40 +01:00
yflory e8c1eb9f11 Improve mute/unmute process 2019-12-13 18:22:14 +01:00
yflory be9dce674f Open and Scrypt invitation link 2019-12-13 17:03:24 +01:00
yflory 9391698f54 Add scrypt and spinner to the link creation process 2019-12-13 11:59:14 +01:00
yflory fa8096fc76 lint compliance 2019-12-12 18:16:42 +01:00
yflory ef05ac440e Invitation link UI 2019-12-12 18:14:17 +01:00
yflory 510fd9a1a6 Merge branch 'master' into staging 2019-12-12 16:24:05 +01:00
yflory d04d36c8cd Merge branch 'master' into inviteUI 2019-12-12 16:23:53 +01:00
yflory f2a84fba78 Merge branch 'soon' 2019-12-12 16:17:52 +01:00
yflory 5f0244beb3 Fix kanban UI issues 2019-12-12 16:09:07 +01:00
yflory 998e2f81d2 Invite to team modal 2019-12-12 15:30:14 +01:00
yflory 585138aeee Fix links in profile description 2019-12-11 17:18:32 +01:00
yflory 3ecad6fa73 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2019-12-11 16:40:55 +01:00
yflory 32891be320 Fix export and username prompt 2019-12-11 16:40:39 +01:00
yflory aa8dd95310 Add unfriend, mute and unmute buttons in profile 2019-12-11 13:28:07 +01:00