Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 09fdfa2ad2 Fix usergrid UI issues yflory 2019-11-25 17:54:22 +01:00
• 28308cb629 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2019-11-25 17:44:01 +01:00
• bf6681c5e6 Better spacing between items in usergrid yflory 2019-11-25 17:43:55 +01:00
• 89cff3c541 Remove invisible title in usergrid yflory 2019-11-25 17:33:56 +01:00
• 27793c6755 remove XXX ansuz 2019-11-25 11:09:54 -05:00
• c1c000149b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2019-11-25 17:07:26 +01:00
• 9efceb2234 Merge pull request #470 from xwiki-labs/design_dialogs_props ansuz 2019-11-25 11:06:10 -05:00
• 53b29ced05 Merge branch 'design_dialogs' into design_dialogs_usergrid David Benqué 2019-11-25 15:58:36 +00:00
• ea79593444 Merge branch 'design_dialogs_props' into design_dialogs_usergrid David Benqué 2019-11-25 15:58:27 +00:00
• 5be70f7673 remove // XXX David Benqué 2019-11-25 15:56:39 +00:00
• ff6de41bec Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2019-11-25 16:54:55 +01:00
• 79013b27fe Merge pull request #469 from xwiki-labs/design_dialogs ansuz 2019-11-25 10:54:49 -05:00
• b9be93101e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2019-11-25 16:53:52 +01:00
• d8df3fd034 Remove XXX yflory 2019-11-25 16:53:47 +01:00
• a1f25d937c bump version to 3.6.0 (GoldenFrog) ansuz 2019-11-25 10:51:46 -05:00
• c414bf1d5c Merge branch 'staging' into ooPassword yflory 2019-11-25 16:51:06 +01:00
• 0dc0df8aa1 Remove XXX yflory 2019-11-25 16:50:38 +01:00
• f826e6aa3b align filter input and buttons David Benqué 2019-11-25 15:42:26 +00:00
• 8b3cea9ad9 remove // XXX David Benqué 2019-11-25 15:11:49 +00:00
• ef857dbe75 Merge branch 'design_dialogs_props' into design_dialogs_usergrid David Benqué 2019-11-25 13:14:40 +00:00
• 12f6e3b1d4 Merge branch 'design_dialogs_props' of github.com:xwiki-labs/cryptpad into design_dialogs_props yflory 2019-11-25 13:26:46 +01:00
• 06434e576e change size message David Benqué 2019-11-25 11:22:07 +00:00
• 5de5bb603d Merge branch 'staging' into design_dialogs_props yflory 2019-11-25 12:17:03 +01:00
• 9a3c4c4350 remove hard-coded punctuation David Benqué 2019-11-25 11:13:04 +00:00
• 6ee98cac5b Fix premium account detection yflory 2019-11-25 11:47:52 +01:00
• 7895d93704 Merge branch 'master' into staging yflory 2019-11-25 11:03:13 +01:00
• b73e195408 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2019-11-25 10:59:35 +01:00
• bfd2ca85b5 Merge branch 'design_dialogs' into staging yflory 2019-11-25 10:59:10 +01:00
• baf911c3c2 lint David Benqué 2019-11-25 09:49:14 +00:00
• 5d7886325d style secondary and cancel buttons David Benqué 2019-11-25 09:48:08 +00:00
• 9e9099f6d8 Translated using Weblate (German) Weblate 2019-11-25 09:45:33 +00:00
• 9a8604dfb4 Fix debug app restore history yflory 2019-11-22 18:02:33 +01:00
• a6589d0d06 Ability to restore an old version from the debug app yflory 2019-11-22 17:58:21 +01:00
• 09a162c6be XXX problem David Benqué 2019-11-22 16:48:09 +00:00
• 552a7d53e7 Translated using Weblate (French) Weblate 2019-11-22 16:39:17 +00:00
• ce08b5234c Translated using Weblate (English) Weblate 2019-11-22 16:39:17 +00:00
• 2940366d70 Update translation files Weblate 2019-11-22 16:32:46 +00:00
• c36038a0b2 Update translation files Weblate 2019-11-22 16:32:46 +00:00
• 4dae892a46 Update translation files Weblate 2019-11-22 16:32:46 +00:00
• 4220787366 Update translation files Weblate 2019-11-22 16:32:46 +00:00
• 5f3fd9858a Update translation files Weblate 2019-11-22 16:32:46 +00:00
• b58fe94170 Update translation files Weblate 2019-11-22 16:32:46 +00:00
• 8f00077df2 Update translation files Weblate 2019-11-22 16:32:46 +00:00
• 1193933509 Update translation files Weblate 2019-11-22 16:32:46 +00:00
• 0eb5c3e5b5 Translated using Weblate (French) Weblate 2019-11-22 16:32:46 +00:00
• 47342dd1c0 Update translation files Weblate 2019-11-22 16:32:45 +00:00
• 7e45f597c9 Merge branch 'design_dialogs' into staging yflory 2019-11-22 17:26:53 +01:00
• 09b07de6f2 lint David Benqué 2019-11-22 16:10:24 +00:00
• 9a67537080 Merge branch 'design_dialogs' into design_dialogs_props David Benqué 2019-11-22 16:09:09 +00:00
• 0429859c26 Merge remote-tracking branch 'origin/design_dialogs' into design_dialogs David Benqué 2019-11-22 16:03:50 +00:00
• 754fa9dab2 review and lint David Benqué 2019-11-22 16:03:17 +00:00
• 82bb710060 Don't close the share modal when clicking Preview yflory 2019-11-22 16:40:20 +01:00
• be7b184d97 Fix space bar shortcut to dselect a radio input yflory 2019-11-22 16:01:32 +01:00
• 1703186ebf correct readonly selector David Benqué 2019-11-22 14:58:22 +00:00
• 65585f6ce8 lint compliance yflory 2019-11-22 15:52:30 +01:00
• a573255072 Word count integration yflory 2019-11-22 15:50:32 +01:00
• 57ba4e0bcd address XXX issues David Benqué 2019-11-22 11:34:13 +00:00
• 9f903b645a ckeditor wordcount yflory 2019-11-22 12:20:07 +01:00
• b39f3b553e re-remove text fields in properties modal David Benqué 2019-11-22 11:16:48 +00:00
• e2b3cf3ccc fix text-input colors David Benqué 2019-11-22 09:52:21 +00:00
• 0d94fba556 align input field with buttons in prompt dialogs David Benqué 2019-11-22 09:18:19 +00:00
• 4eb9e0dabf Revert "remove text fields in properties modal" David Benqué 2019-11-22 09:04:11 +00:00
• dfcf6d7155 remove text fields in properties modal David Benqué 2019-11-21 17:07:38 +00:00
• 730c4e02cf re-enable click to open share modal David Benqué 2019-11-21 16:37:06 +00:00
• c4f84b9ee9 add icons to filesharemodal tabs David Benqué 2019-11-21 15:39:23 +00:00
• 8cfc108276 text input styling David Benqué 2019-11-21 15:33:15 +00:00
• 6a663c5d35 re-re-align buttons David Benqué 2019-11-21 15:16:25 +00:00
• cc5d6260dc re-align buttons and modal content David Benqué 2019-11-21 15:09:38 +00:00
• 2a23359d8f fix import of modals-ui-elements David Benqué 2019-11-21 14:31:57 +00:00
• 15e23a2d04 Merge branch 'soon' into staging yflory 2019-11-21 15:30:21 +01:00
• 72e0abfbaa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2019-11-21 15:30:17 +01:00
• 9f3aa25fdd move modal styles to new file David Benqué 2019-11-21 13:50:46 +00:00
• fae0a930e3 tab icons correction David Benqué 2019-11-21 13:03:40 +00:00
• 8a11cf9b38 style share modal David Benqué 2019-11-21 12:29:23 +00:00
• d38f5a16c2 add optional icon to modal tabs David Benqué 2019-11-21 10:26:30 +00:00
• dc6ca9098e Improve small screen detection in toolbar yflory 2019-11-21 11:24:51 +01:00
• 339030a84e bug fixes David Benqué 2019-11-20 17:03:16 +00:00
• 682b8e4361 refactor file share modal David Benqué 2019-11-20 16:47:06 +00:00
• 2b4c3e9e90 Fix team quota yflory 2019-11-20 17:15:38 +01:00
• 13246d64ce get link from ShareWithFriends David Benqué 2019-11-20 15:57:30 +00:00
• 8d46bbf3b4 update link preview in embed tab David Benqué 2019-11-20 15:39:33 +00:00
• e7da5493ee Merge branch 'soon' into staging ansuz 2019-11-20 10:09:00 -05:00
• b8753f1fd7 clean up share modal David Benqué 2019-11-20 13:14:25 +00:00
• 598ce5a329 create share modal in common-ui David Benqué 2019-11-20 13:11:38 +00:00
• ae6f5074a7 align button to share with contacts David Benqué 2019-11-20 11:27:47 +00:00
• 96f82c8e7c fix modal buttons and functions David Benqué 2019-11-20 11:01:19 +00:00
• 33b16ffcdf address notes David Benqué 2019-11-20 09:47:57 +00:00
• aa782ba3aa Merge branch 'soon' yflory 2019-11-19 18:00:09 +01:00
• 1e2b2a27cf Fix synchronous nthen callback yflory 2019-11-19 17:55:33 +01:00
• 718fdb556b show message in Contacts tab if user has no contacts David Benqué 2019-11-19 16:48:37 +00:00
• db104d6610 align button array in Link tab David Benqué 2019-11-19 16:28:05 +00:00
• aa743d5c90 use messages for contacts tab title David Benqué 2019-11-19 16:24:29 +00:00
• 0044d622f1 Fix missing title in notification history yflory 2019-11-19 15:33:12 +01:00
• 4f145aed00 remove wide size for share modal David Benqué 2019-11-19 15:31:11 +00:00
• 874dce748d split share modal into 3 tabs David Benqué 2019-11-19 15:30:23 +00:00
• a2789b9395 Merge branch 'soon' ansuz 2019-11-19 10:03:54 -05:00
• da32864413 Fix other read-only teams issues yflory 2019-11-19 15:45:37 +01:00
• 741acbd6ef Remove XXX yflory 2019-11-19 15:21:11 +01:00
• 870607c338 Preserve kanban title edition when receiving remote changes yflory 2019-11-19 15:20:39 +01:00
• a297336746 Fix broken link in cryptpad-docker.md yflory 2019-11-19 14:01:56 +01:00