Commit Graph

  • 826a86c7d6 Fix joining your own team yflory 2019-12-19 16:21:10 +0100
  • dc47091637 outline mute button David Benqué 2019-12-19 14:48:57 +0000
  • 361292ff01 Fix button width in profile yflory 2019-12-19 15:37:09 +0100
  • 20aeb0fde6 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI yflory 2019-12-19 11:56:31 +0100
  • 4869b4e0c3 Delete invitation after using it yflory 2019-12-19 11:56:20 +0100
  • aca9ddca06 Display error message when trying to use an invitation link a second time yflory 2019-12-19 11:45:50 +0100
  • 5db81f3990 add margin to team roster header buttons David Benqué 2019-12-19 10:43:28 +0000
  • 0dc4a1d890 Display error message when using an invalid invitation link yflory 2019-12-19 11:38:09 +0100
  • de5feeda13 Remove some tippy titles yflory 2019-12-19 11:27:41 +0100
  • f78a4c538c Merge remote-tracking branch 'origin/inviteUI' into inviteUI David Benqué 2019-12-19 10:10:00 +0000
  • c6e7b5d552 add translation keys for errors David Benqué 2019-12-19 10:09:39 +0000
  • 262ccf1265 Merge branch 'staging' into inviteUI yflory 2019-12-19 11:08:26 +0100
  • 92c6bbc99a Translated using Weblate (French) Weblate 2019-12-19 10:08:10 +0000
  • 675ef60362 Translated using Weblate (English) Weblate 2019-12-19 10:08:09 +0000
  • 3bebab57e4 Remove XXX yflory 2019-12-19 10:54:58 +0100
  • bfc519331b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2019-12-19 10:35:38 +0100
  • d2ba375491 Improve profile UI yflory 2019-12-19 10:34:08 +0100
  • e3fc741402 Translated using Weblate (German) Weblate 2019-12-18 23:21:39 +0000
  • dc4feda738 Translated using Weblate (English) Weblate 2019-12-18 23:21:38 +0000
  • ceb7fc4f66 remove XXX notes which have been addressed ansuz 2019-12-18 18:18:14 -0500
  • ea7d254d2f remove XXX ansuz 2019-12-18 18:00:27 -0500
  • 167a846cf3 remove unused dependency ansuz 2019-12-18 17:59:28 -0500
  • 9ad2bf2bd6 lint compliance yflory 2019-12-18 19:11:35 +0100
  • e0782d753d Fix conflicting curvePublic yflory 2019-12-18 19:10:30 +0100
  • 3cd93b1d52 Fix UI issue yflory 2019-12-18 18:47:08 +0100
  • 186487cbda Fix cryptput issues yflory 2019-12-18 18:45:17 +0100
  • 8c09e7d43c Merge branch 'staging' into inviteUI yflory 2019-12-18 18:26:41 +0100
  • a518cbcce7 Fix translation keys yflory 2019-12-18 18:26:25 +0100
  • b402b3c552 Add wrong password handler yflory 2019-12-18 18:25:44 +0100
  • 0b6539893b Fix missing curvePublic yflory 2019-12-18 18:17:05 +0100
  • 62c6765c21 Merge branch 'staging' into inviteUI yflory 2019-12-18 18:14:10 +0100
  • a6c5ba4013 Translated using Weblate (French) Weblate 2019-12-18 17:13:51 +0000
  • df4664f877 Translated using Weblate (English) Weblate 2019-12-18 17:13:51 +0000
  • 4d1079e1e2 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI yflory 2019-12-18 18:11:12 +0100
  • 994eefaf63 Merge branch 'staging' into inviteUI yflory 2019-12-18 18:10:50 +0100
  • 25b88afeea Fix invitation links yflory 2019-12-18 18:10:33 +0100
  • f4072ae817 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI ansuz 2019-12-18 12:02:52 -0500
  • 9824136917 fix a typo ansuz 2019-12-18 12:02:42 -0500
  • f98543bb83 Add category icon for link invitation yflory 2019-12-18 18:02:33 +0100
  • 90d8a7a684 remove an unused dependency ansuz 2019-12-18 12:02:26 -0500
  • fc2f8ff01e Translated using Weblate (German) Weblate 2019-12-18 17:02:23 +0000
  • 3a8b7783d5 Translated using Weblate (French) Weblate 2019-12-18 17:02:23 +0000
  • 6111f1dc36 Translated using Weblate (English) Weblate 2019-12-18 17:02:23 +0000
  • 663a1138b4 trim leading spaces from domains ansuz 2019-12-18 12:01:58 -0500
  • 7008c71605 Clean teams inner code yflory 2019-12-18 17:46:04 +0100
  • 6945628cf1 handle error in team outer yflory 2019-12-18 17:45:57 +0100
  • 97f322753a Add owners to invitation channels yflory 2019-12-18 17:12:29 +0100
  • 32fd1b4971 remove debugging console.error yflory 2019-12-18 16:59:17 +0100
  • 1826d05e31 Keep cloned data when accepting team invitation yflory 2019-12-18 16:58:02 +0100
  • 7db7db262c Fix 'enter' key in team invite modal yflory 2019-12-18 16:36:06 +0100
  • 563e2161c3 Merge branch 'staging' into inviteUI yflory 2019-12-18 16:23:15 +0100
  • 032186cc4c Fix unsanitized name in profile again yflory 2019-12-18 16:15:33 +0100
  • 704d42d169 Fix unsanitized name in profile yflory 2019-12-18 16:08:22 +0100
  • e6e1ef72e7 Merge branch 'staging' into inviteUI yflory 2019-12-18 15:12:43 +0100
  • a34aad78ab Remove duplicate code yflory 2019-12-18 15:12:33 +0100
  • 1dee406365 bump footer version ansuz 2019-12-18 08:25:15 -0500
  • 091ffc6070 fixHTML of user and team names in translation key David Benqué 2019-12-18 13:08:15 +0000
  • f548266746 add translation keys David Benqué 2019-12-18 12:57:43 +0000
  • a817242fe5 Fix join team for anon users yflory 2019-12-18 13:05:01 +0100
  • 8eed376274 Fix default category after joining a team yflory 2019-12-18 12:42:24 +0100
  • efa56e5fbc lint compliance yflory 2019-12-18 12:32:13 +0100
  • 404f5fb4da Handle max teams slots with link invitation yflory 2019-12-18 12:29:39 +0100
  • fc8ee58cfb Fix joinTeam undefined data yflory 2019-12-18 12:09:37 +0100
  • b58901e229 Fix link generation yflory 2019-12-18 12:04:36 +0100
  • 0574bd9286 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI yflory 2019-12-18 11:37:21 +0100
  • a5f88c505d lint compliance yflory 2019-12-18 11:37:17 +0100
  • e406bf05e8 Merge remote-tracking branch 'origin/inviteUI' into inviteUI David Benqué 2019-12-18 10:35:54 +0000
  • 400b39d46a Join a team from a link yflory 2019-12-18 11:35:39 +0100
  • 3c9199ed42 UI for invite accept page David Benqué 2019-12-18 10:35:21 +0000
  • 3d1b3b5d18 Fix RPC data yflory 2019-12-18 10:52:20 +0100
  • 906b315487 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI yflory 2019-12-18 10:42:03 +0100
  • fc651747ca Fix error message not displayed when creating a invitation link yflory 2019-12-18 10:38:26 +0100
  • 89b5e30309 more WIP ansuz 2019-12-17 19:27:39 -0500
  • 5b8eb1c070 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2019-12-17 17:57:28 +0100
  • 215cabc053 Fix sidebar layout buttons in team drive yflory 2019-12-17 17:57:07 +0100
  • 03cf969c41 remove hard-coded key David Benqué 2019-12-17 16:50:00 +0000
  • 147d6cf232 Merge remote-tracking branch 'origin/staging' into staging David Benqué 2019-12-17 16:41:10 +0000
  • 43d30081e7 spacing of buttons in manage mute modal David Benqué 2019-12-17 16:40:02 +0000
  • 790c9aa0d7 Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI yflory 2019-12-17 17:28:31 +0100
  • cf2a624775 Add 'Join team' and 'Decline' buttons yflory 2019-12-17 17:27:41 +0100
  • d9ae669015 Handle deleted invitation error yflory 2019-12-17 17:18:40 +0100
  • 972f50052d Merge branch 'sidebarbuttons' of github.com:xwiki-labs/cryptpad into sidebarbuttons David Benqué 2019-12-17 16:10:41 +0000
  • 1588ced325 add spacing to manage mute modal David Benqué 2019-12-17 16:10:36 +0000
  • 55baf4ab29 Merge branch 'sidebarbuttons' of github.com:xwiki-labs/cryptpad into sidebarbuttons yflory 2019-12-17 17:04:04 +0100
  • 4cc2da7222 Fix HTML message displayed as text in profile yflory 2019-12-17 17:03:56 +0100
  • 0b248348eb Fix mute/unmute button in contacts yflory 2019-12-17 17:01:15 +0100
  • 71ac44e239 move help icon color to alertify styles David Benqué 2019-12-17 15:54:02 +0000
  • 84174dbced re-fix password help icon David Benqué 2019-12-17 15:46:38 +0000
  • 0f87052198 fix password help icon alignment David Benqué 2019-12-17 15:34:53 +0000
  • 2dd5f5fc2f fix password help icon David Benqué 2019-12-17 15:09:57 +0000
  • 45e74e416c style manage muted button David Benqué 2019-12-17 14:16:34 +0000
  • 64fba3e379 Merge branch 'mute' into sidebarbuttons yflory 2019-12-17 14:28:37 +0100
  • 55acf9d4a0 Merge branch 'staging' into mute yflory 2019-12-17 14:28:23 +0100
  • d2ea3c4221 show form and switch buttons if error David Benqué 2019-12-17 11:18:38 +0000
  • 5302077be1 Merge branch 'inviteUI_design' into inviteUI David Benqué 2019-12-17 10:52:18 +0000
  • 3cd957a552 fix button margins David Benqué 2019-12-17 10:51:17 +0000
  • 3aa111d8a8 lint compliance yflory 2019-12-17 11:49:32 +0100
  • 5174472329 Fix link generation bug yflory 2019-12-17 11:48:23 +0100
  • 4f8ca40d36 hide and show buttons to create/copy link David Benqué 2019-12-17 10:30:44 +0000
  • 6a712a7b52 View pending invitation links and remove them (if admin) yflory 2019-12-17 11:24:49 +0100