web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • efa56e5fbc lint compliance yflory 2019-12-18 12:32:13 +01:00
  • 404f5fb4da Handle max teams slots with link invitation yflory 2019-12-18 12:29:39 +01:00
  • fc8ee58cfb Fix joinTeam undefined data yflory 2019-12-18 12:09:37 +01:00
  • b58901e229 Fix link generation yflory 2019-12-18 12:04:36 +01:00
  • 0574bd9286 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI yflory 2019-12-18 11:37:21 +01:00
  • a5f88c505d lint compliance yflory 2019-12-18 11:37:17 +01:00
  • e406bf05e8 Merge remote-tracking branch 'origin/inviteUI' into inviteUI David Benqué 2019-12-18 10:35:54 +00:00
  • 400b39d46a Join a team from a link yflory 2019-12-18 11:35:39 +01:00
  • 3c9199ed42 UI for invite accept page David Benqué 2019-12-18 10:35:21 +00:00
  • 3d1b3b5d18 Fix RPC data yflory 2019-12-18 10:52:20 +01:00
  • 906b315487 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI yflory 2019-12-18 10:42:03 +01:00
  • fc651747ca Fix error message not displayed when creating a invitation link yflory 2019-12-18 10:38:26 +01:00
  • 89b5e30309 more WIP ansuz 2019-12-17 19:27:39 -05:00
  • 5b8eb1c070 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2019-12-17 17:57:28 +01:00
  • 215cabc053 Fix sidebar layout buttons in team drive yflory 2019-12-17 17:57:07 +01:00
  • 03cf969c41 remove hard-coded key David Benqué 2019-12-17 16:50:00 +00:00
  • 147d6cf232 Merge remote-tracking branch 'origin/staging' into staging David Benqué 2019-12-17 16:41:10 +00:00
  • 43d30081e7 spacing of buttons in manage mute modal David Benqué 2019-12-17 16:40:02 +00:00
  • 790c9aa0d7 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI yflory 2019-12-17 17:28:31 +01:00
  • cf2a624775 Add 'Join team' and 'Decline' buttons yflory 2019-12-17 17:27:41 +01:00
  • d9ae669015 Handle deleted invitation error yflory 2019-12-17 17:18:40 +01:00
  • 972f50052d Merge branch 'sidebarbuttons' of github.com:xwiki-labs/cryptpad into sidebarbuttons David Benqué 2019-12-17 16:10:41 +00:00
  • 1588ced325 add spacing to manage mute modal David Benqué 2019-12-17 16:10:36 +00:00
  • 55baf4ab29 Merge branch 'sidebarbuttons' of github.com:xwiki-labs/cryptpad into sidebarbuttons yflory 2019-12-17 17:04:04 +01:00
  • 4cc2da7222 Fix HTML message displayed as text in profile yflory 2019-12-17 17:03:56 +01:00
  • 0b248348eb Fix mute/unmute button in contacts yflory 2019-12-17 17:01:15 +01:00
  • 71ac44e239 move help icon color to alertify styles David Benqué 2019-12-17 15:54:02 +00:00
  • 84174dbced re-fix password help icon David Benqué 2019-12-17 15:46:38 +00:00
  • 0f87052198 fix password help icon alignment David Benqué 2019-12-17 15:34:53 +00:00
  • 2dd5f5fc2f fix password help icon David Benqué 2019-12-17 15:09:57 +00:00
  • 45e74e416c style manage muted button David Benqué 2019-12-17 14:16:34 +00:00
  • 64fba3e379 Merge branch 'mute' into sidebarbuttons yflory 2019-12-17 14:28:37 +01:00
  • 55acf9d4a0 Merge branch 'staging' into mute yflory 2019-12-17 14:28:23 +01:00
  • d2ea3c4221 show form and switch buttons if error David Benqué 2019-12-17 11:18:38 +00:00
  • 5302077be1 Merge branch 'inviteUI_design' into inviteUI David Benqué 2019-12-17 10:52:18 +00:00
  • 3cd957a552 fix button margins David Benqué 2019-12-17 10:51:17 +00:00
  • 3aa111d8a8 lint compliance yflory 2019-12-17 11:49:32 +01:00
  • 5174472329 Fix link generation bug yflory 2019-12-17 11:48:23 +01:00
  • 4f8ca40d36 hide and show buttons to create/copy link David Benqué 2019-12-17 10:30:44 +00:00
  • 6a712a7b52 View pending invitation links and remove them (if admin) yflory 2019-12-17 11:24:49 +01:00
  • 35dbfe0bb5 Pin the invitation link channels yflory 2019-12-17 11:12:18 +01:00
  • 5a055233c0 Fix cryptget inner yflory 2019-12-17 10:57:13 +01:00
  • e38d6d1093 Fix link generation yflory 2019-12-17 10:29:02 +01:00
  • da4399e3dc Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI ansuz 2019-12-16 20:58:23 -05:00
  • c82c50c274 WIP team invitations ansuz 2019-12-16 20:57:19 -05:00
  • 1a521b57c8 implement INVITE and ACCEPT roster methods ansuz 2019-12-16 17:22:30 -05:00
  • 495cb4403b Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI yflory 2019-12-16 18:37:53 +01:00
  • 0716014eef Refactoring joining team from link yflory 2019-12-16 18:36:34 +01:00
  • 0cbde8d90f Merge branch 'staging' into inviteUI ansuz 2019-12-16 12:07:46 -05:00
  • af6b77a2ff fix script errors ansuz 2019-12-16 11:59:12 -05:00
  • 71da3ed723 add button keys David Benqué 2019-12-16 16:51:53 +00:00
  • 5a55bcde3d Translated using Weblate (French) Weblate 2019-12-16 16:51:03 +00:00
  • c21a45fbde Translated using Weblate (English) Weblate 2019-12-16 16:51:03 +00:00
  • daf5017bda Translated using Weblate (German) Weblate 2019-12-16 16:40:21 +00:00
  • 6d4bfe4dfd Translated using Weblate (French) Weblate 2019-12-16 16:40:21 +00:00
  • b332c97db9 Translated using Weblate (English) Weblate 2019-12-16 16:40:21 +00:00
  • 4626d036cb Cryptget in common/invitation yflory 2019-12-16 17:12:58 +01:00
  • 01e7ec7e88 Merge remote-tracking branch 'origin/inviteUI' into inviteUI David Benqué 2019-12-16 16:09:40 +00:00
  • 4173bf168f alert margins David Benqué 2019-12-16 16:05:59 +00:00
  • fccd1d5cc0 resize spinner David Benqué 2019-12-16 16:05:41 +00:00
  • 8b333a8147 size message textarea and remove resize David Benqué 2019-12-16 16:05:06 +00:00
  • 00b0499db5 add translation keys David Benqué 2019-12-16 16:03:56 +00:00
  • 6686e0e841 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI ansuz 2019-12-16 10:22:44 -05:00
  • af463c2de9 use the same APIs when creating invites as you do when redeeming them ansuz 2019-12-16 10:22:22 -05:00
  • cfb6318b86 Team invitation link, add alert yflory 2019-12-16 16:06:22 +01:00
  • 1af0dfb065 fix expiration time padding David Benqué 2019-12-16 14:42:18 +00:00
  • 042cfffbe8 use APIs instead of creating invitations inline ansuz 2019-12-16 09:38:36 -05:00
  • 27638e7f63 button colors in pad creation settings David Benqué 2019-12-16 14:25:15 +00:00
  • 07ef60418b Merge branch 'mute' into sidebarbuttons yflory 2019-12-16 14:46:36 +01:00
  • 47128802a2 Merge branch 'staging' into mute yflory 2019-12-16 14:43:14 +01:00
  • 89e08704e5 Translated using Weblate (German) Weblate 2019-12-16 13:42:19 +00:00
  • d3718679c0 Translated using Weblate (French) Weblate 2019-12-16 13:42:18 +00:00
  • 92f78afb01 Translated using Weblate (Finnish) Weblate 2019-12-16 13:42:18 +00:00
  • df938c141b Translated using Weblate (English) Weblate 2019-12-16 13:42:18 +00:00
  • b5193914e3 Add mute info in the profile app yflory 2019-12-16 14:17:40 +01:00
  • f64c11dc3a Fix profile app yflory 2019-12-16 14:12:33 +01:00
  • 7f5c5c18a3 Merge branch 'mute' into sidebarbuttons yflory 2019-12-16 13:58:21 +01:00
  • ac5100b3b2 Update mute icon in profile yflory 2019-12-16 13:57:49 +01:00
  • 0ee6fcb6bc Add unmute contacts button yflory 2019-12-16 13:09:52 +01:00
  • 9e08a97d72 Alertify buttons and inputs added to sidebar layout yflory 2019-12-16 12:51:12 +01:00
  • 4a83103f52 WIP invitation API ansuz 2019-12-13 18:38:05 -05:00
  • 7a5bfe8245 pw => password, /common/invitation.js scaffolding ansuz 2019-12-13 18:27:48 -05:00
  • fb8be19657 Fix buttons UI in contacts yflory 2019-12-13 18:43:30 +01:00
  • e8c1eb9f11 Improve mute/unmute process yflory 2019-12-13 18:22:14 +01:00
  • be9dce674f Open and Scrypt invitation link yflory 2019-12-13 17:03:24 +01:00
  • 9391698f54 Add scrypt and spinner to the link creation process yflory 2019-12-13 11:59:14 +01:00
  • fa8096fc76 lint compliance yflory 2019-12-12 18:16:42 +01:00
  • ef05ac440e Invitation link UI yflory 2019-12-12 18:14:17 +01:00
  • 510fd9a1a6 Merge branch 'master' into staging yflory 2019-12-12 16:24:05 +01:00
  • d04d36c8cd Merge branch 'master' into inviteUI yflory 2019-12-12 16:23:53 +01:00
  • f2a84fba78 Merge branch 'soon' yflory 2019-12-12 16:17:52 +01:00
  • 408bc94765 Translated using Weblate (German) Weblate 2019-12-12 15:09:44 +00:00
  • 5ad69fcec8 Translated using Weblate (French) Weblate 2019-12-12 15:09:44 +00:00
  • f110162164 Translated using Weblate (English) Weblate 2019-12-12 15:09:44 +00:00
  • 13307e40e5 Translated using Weblate (German) Weblate 2019-12-12 15:09:44 +00:00
  • 1778200b57 Translated using Weblate (French) Weblate 2019-12-12 15:09:44 +00:00
  • 9673795d65 Translated using Weblate (English) Weblate 2019-12-12 15:09:44 +00:00
  • 5f0244beb3 Fix kanban UI issues yflory 2019-12-12 16:09:07 +01:00
  • 998e2f81d2 Invite to team modal yflory 2019-12-12 15:30:14 +01:00
  • 585138aeee Fix links in profile description yflory 2019-12-11 17:18:32 +01:00