dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,893 Commits 73 Branches 132 Tags 560 MiB
Commit Graph

432 Commits

Author SHA1 Message Date
ansuz b246fc73a7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-11-25 20:59:42 -05:00
ansuz b5a05c1de3 clean up some dead code and do a quick optimizing pass 2019-11-25 20:37:04 -05:00
yflory 09fdfa2ad2 Fix usergrid UI issues 2019-11-25 17:54:22 +01:00
yflory 28308cb629 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-11-25 17:44:01 +01:00
yflory 89cff3c541 Remove invisible title in usergrid 2019-11-25 17:33:56 +01:00
ansuz 27793c6755 remove XXX 2019-11-25 11:09:54 -05:00
ansuz 9efceb2234
Merge pull request #470 from xwiki-labs/design_dialogs_props 
remove // XXX
 2019-11-25 11:06:10 -05:00
David Benqué 5be70f7673 remove // XXX 2019-11-25 15:56:39 +00:00
ansuz 79013b27fe
Merge pull request #469 from xwiki-labs/design_dialogs 
remove // XXX
 2019-11-25 10:54:49 -05:00
yflory c414bf1d5c Merge branch 'staging' into ooPassword 2019-11-25 16:51:06 +01:00
David Benqué 8b3cea9ad9 remove // XXX 2019-11-25 15:11:49 +00:00
yflory 12f6e3b1d4 Merge branch 'design_dialogs_props' of github.com:xwiki-labs/cryptpad into design_dialogs_props 2019-11-25 13:26:46 +01:00
David Benqué 06434e576e change size message 2019-11-25 11:22:07 +00:00
yflory 5de5bb603d Merge branch 'staging' into design_dialogs_props 2019-11-25 12:17:03 +01:00
David Benqué 9a3c4c4350 remove hard-coded punctuation 2019-11-25 11:13:04 +00:00
David Benqué 09a162c6be XXX problem 2019-11-22 16:48:09 +00:00
yflory 7e45f597c9 Merge branch 'design_dialogs' into staging 2019-11-22 17:26:53 +01:00
David Benqué 9a67537080 Merge branch 'design_dialogs' into design_dialogs_props 2019-11-22 16:09:09 +00:00
David Benqué 0429859c26 Merge remote-tracking branch 'origin/design_dialogs' into design_dialogs 2019-11-22 16:03:50 +00:00
David Benqué 754fa9dab2 review and lint 2019-11-22 16:03:17 +00:00
yflory 82bb710060 Don't close the share modal when clicking Preview 2019-11-22 16:40:20 +01:00
David Benqué 57ba4e0bcd address XXX issues 2019-11-22 11:34:13 +00:00
David Benqué b39f3b553e re-remove text fields in properties modal 2019-11-22 11:16:48 +00:00
David Benqué 4eb9e0dabf Revert "remove text fields in properties modal" 
This reverts commit dfcf6d7155.
 2019-11-22 09:04:11 +00:00
David Benqué dfcf6d7155 remove text fields in properties modal 2019-11-21 17:07:38 +00:00
David Benqué c4f84b9ee9 add icons to filesharemodal tabs 2019-11-21 15:39:23 +00:00
David Benqué 9f3aa25fdd move modal styles to new file 2019-11-21 13:50:46 +00:00
David Benqué fae0a930e3 tab icons correction 2019-11-21 13:03:40 +00:00
David Benqué 8a11cf9b38 style share modal 2019-11-21 12:29:23 +00:00
David Benqué 339030a84e bug fixes 2019-11-20 17:03:16 +00:00
David Benqué 682b8e4361 refactor file share modal 2019-11-20 16:47:06 +00:00
David Benqué 13246d64ce get link from ShareWithFriends 2019-11-20 15:57:30 +00:00
David Benqué 8d46bbf3b4 update link preview in embed tab 2019-11-20 15:39:33 +00:00
David Benqué b8753f1fd7 clean up share modal 
- share access rights buttons between all tabs
- handle present mode when available
- general clean up of code to be more readable
 2019-11-20 13:14:25 +00:00
David Benqué 598ce5a329 create share modal in common-ui 2019-11-20 13:11:38 +00:00
David Benqué ae6f5074a7 align button to share with contacts 
split the output of createShareWithFriends in content and button
 2019-11-20 11:27:47 +00:00
David Benqué 96f82c8e7c fix modal buttons and functions 2019-11-20 11:01:19 +00:00
David Benqué 33b16ffcdf address notes 2019-11-20 09:47:57 +00:00
David Benqué 718fdb556b show message in Contacts tab if user has no contacts 2019-11-19 16:48:37 +00:00
David Benqué db104d6610 align button array in Link tab 2019-11-19 16:28:05 +00:00
David Benqué aa743d5c90 use messages for contacts tab title 2019-11-19 16:26:59 +00:00
yflory 0044d622f1 Fix missing title in notification history 2019-11-19 16:49:04 +01:00
David Benqué 874dce748d split share modal into 3 tabs 2019-11-19 15:30:23 +00:00
yflory 3bdca60c76 Display the prefilled password page when receiving a password-protected pad 2019-11-19 10:40:55 +01:00
yflory 2fd31e8d89 Improve password prompt UI 2019-11-18 10:56:24 +01:00
yflory 6047a8640e temp 2019-11-14 15:49:46 +01:00
David Benqué b5f0c18975 Merge branch 'tippy-prune' into staging 2019-11-08 14:49:06 +00:00
yflory 8e403c4f46 Merge branch 'ro' into filePassword 2019-11-08 15:28:35 +01:00
yflory 5dcc7643da Fix missing teams in the share modal 2019-11-08 12:04:30 +01:00
David Benqué 042f9fe684 add storage info and change bar 2019-11-08 10:24:07 +00:00
yflory b0f5254942 Fix owners not set properly when storing a file the first time 2019-10-31 14:00:04 +01:00
yflory c1ffb1e94e Fix UI issue in the rights properties modal with open pads 2019-10-31 12:17:03 +01:00
yflory b4c9c7700f Blob password change UI 2019-10-31 12:12:45 +01:00
yflory c64eabc33a Change blob password 2019-10-30 18:29:33 +01:00
yflory 96968f2076 Disable 'forget' button for pads in read-only teams 2019-10-29 12:24:44 +01:00
yflory 0ce79e9c04 Merge branch 'staging' into ro 2019-10-29 11:40:34 +01:00
yflory 6b1e394170 Remove log 2019-10-29 11:36:53 +01:00
yflory 289f71ae8b Merge branch 'staging' into ro 2019-10-28 15:10:29 +01:00
yflory 9090002e1f Transfer shared folder ownership 2019-10-28 15:05:49 +01:00
yflory 07fbe6c284 Fix transfer ownership to ourselves via a team 2019-10-28 14:30:32 +01:00
yflory a1e4c52a83 Fix editable UI displayed for team viewers 2019-10-28 14:05:08 +01:00
yflory c59d41d8f6 Fix Ctrl+E menu in some parts of the drive 2019-10-25 18:25:32 +02:00
yflory 37a72d2f87 Fix more issues when changing password of a readonly folder 2019-10-25 16:36:00 +02:00
yflory 9477ae0895 Merge branch 'sfPassword' into ro 2019-10-22 17:26:32 +02:00
yflory a511fccdc2 Don't log error when a friend's avatar has been deleted 2019-10-22 16:15:13 +02:00
yflory 550965b1c8 Password change UI 2019-10-22 15:22:43 +02:00
yflory b2f89e289d Merge branch 'sfPassword' into ro 2019-10-21 17:43:46 +02:00
yflory 302030e1ee Shared folder password change 2019-10-21 15:23:13 +02:00
yflory 66f2ece08e Add feedback keys 2019-10-15 18:03:53 +02:00
yflory 50829d3db1 Share a folder with a read-only URL 2019-10-14 17:37:58 +02:00
yflory e5deffe21f Fix team deletion 2019-10-08 11:10:26 +02:00
yflory 3015d7f22b Fix team deletion 2019-10-08 11:10:03 +02:00
yflory 390ca941e7 Add links to the CryptPad survey and to the crowdfunding page 2019-10-03 18:09:20 +02:00
yflory f341ac2637 Enable teams by default 2019-10-01 10:59:26 +02:00
yflory 1a69a0cab7 Add links to the teams APP 2019-10-01 10:57:46 +02:00
yflory 0b542f6be8 Use the correct app name for teams 2019-10-01 10:32:37 +02:00
yflory 72ba9ab999 Add translation keys 2019-09-30 16:41:31 +02:00
yflory 295a712942 Transfer team ownership 2019-09-30 15:17:26 +02:00
yflory 44edbf8b39 Remove some XXX 2019-09-27 16:03:06 +02:00
yflory aaed0b939e Transfer ownership from or to a team 2019-09-27 16:00:58 +02:00
yflory d2787313f1 UI improvements for the rights properties modal 2019-09-26 14:36:55 +02:00
yflory a73af811d3 Make user grid layout reusable 2019-09-26 12:53:02 +02:00
yflory 5ad5e32ec8 Change pad password with a team owner 2019-09-26 11:19:16 +02:00
yflory 0bb536bf13 Remove team selection from the PCS 2019-09-24 18:09:07 +02:00
yflory ba6ca87792 Team UI with max teams slots 2019-09-24 16:55:05 +02:00
yflory b41fd12deb Teams... 2019-09-24 11:49:11 +02:00
yflory d90115fbc9 Add translation keys and remove/fix XXX 2019-09-24 10:52:03 +02:00
yflory b1dab8e75a Add team usage bar 2019-09-23 15:45:24 +02:00
yflory 83bc0d84f0 Add comments and XXX 2019-09-23 14:35:57 +02:00
yflory b6c5403050 Hide the team app behind a flag 2019-09-23 11:52:49 +02:00
yflory 45d37acc84 lint compliance 2019-09-20 17:29:21 +02:00
yflory e4e2c3a19d Team invitation 2019-09-20 15:27:20 +02:00
yflory 3d96f3d7b1 lint compliance 2019-09-18 18:01:37 +02:00
yflory 1b9a8828e9 Update team name and add an avatar to the team 2019-09-18 18:00:44 +02:00
yflory 0d3f9db184 Improve sharing between drive and teams 2019-09-18 16:02:58 +02:00
yflory 938a42aae8 lint compliance 2019-09-16 16:49:21 +02:00
yflory 799d93eb48 Prevent sharing a pad with a team from this team's drive 2019-09-13 16:55:48 +02:00
yflory b76cef9660 Store a pad in a team drive 2019-09-13 16:45:07 +02:00
yflory 353da76808 Improve share modal UI 2019-09-12 18:51:03 +02:00
yflory 306fc6cdb9 Create and store pads in a team 2019-09-12 17:54:50 +02:00
yflory 798296489a Merge branch 'staging' into team 2019-09-10 15:32:05 +02:00
yflory fc3c487421 Disable transfer ownership for shared folders and files 2019-09-10 11:23:00 +02:00
yflory dbe63f254a Merge branch 'staging' into team 2019-09-09 15:39:28 +02:00
yflory 84249a92b5 Keep only one getPadMetadata in outer 2019-09-09 14:47:57 +02:00
yflory 634d24b46c Team APP UI 2019-09-06 18:47:18 +02:00
yflory 15387af020 Merge branch 'staging' into team 2019-09-06 15:46:19 +02:00
yflory 6049e67795 Fix remove yourself as owner with a new-ish account 2019-09-05 14:18:56 +02:00
yflory 1a8f47d558 Add Team app 2019-09-04 16:08:53 +02:00
yflory 2b4c615cd4 lint compliance 2019-09-03 17:06:29 +02:00
yflory e15b57989b Fix UI issues 2019-09-03 16:40:09 +02:00
yflory c64adea8ff Translation keys 2019-09-03 15:28:23 +02:00
yflory 4027672678 Store the mailbox of all the owners 2019-09-03 15:11:23 +02:00
yflory c4dcfc9ccf Fix redraw ownership modal in drive 2019-09-03 13:45:32 +02:00
yflory 32f1d1627f Refresh properties modal when receiving metadata updates 2019-09-03 13:30:35 +02:00
yflory 6e5fdc0b8e Get all pad attributes at once 2019-09-03 10:55:48 +02:00
yflory 4708d59a65 Add notifications when removed from owners or pending_owners 2019-09-02 18:46:52 +02:00
yflory 772ecb7365 Make sure you always know yourself in the ownerhsip modal 2019-09-02 17:58:36 +02:00
yflory e76a62c2a5 Filter out pending_owners from the 'add owners' column 2019-09-02 17:45:55 +02:00
yflory d6b6b8f11f Store the pad to the drive when accepting ownership 2019-09-02 17:42:30 +02:00
yflory e131661673 Accept and decline ownership offers 2019-08-30 17:36:27 +02:00
yflory c76363e765 lint compliance 2019-08-30 16:43:18 +02:00
yflory 9822c28f3b Implement ADD_OWNER notification with pending_owner metadata 2019-08-30 16:41:48 +02:00
yflory 2d5b6a53ff Fix UI issues with ownership management 2019-08-29 11:28:51 +02:00
yflory 2a91643d59 Remove an owner 2019-08-28 16:37:13 +02:00
yflory f6762f7c01 Make the friends list from the share modal reusable 2019-08-28 15:29:38 +02:00
yflory 7bd4a4028b Fix fileHost again... 2019-08-27 15:31:22 +02:00
yflory c62e279224 Fix share modal friends list 2019-08-27 11:37:39 +02:00
yflory 9d32dbb7e5 Remove console.log 2019-08-23 17:19:08 +02:00
yflory 31f365474b Fix fileHost for avatars 2019-08-23 17:12:39 +02:00
yflory c95db33157 Improve pricing visibility 2019-08-23 16:19:45 +02:00
yflory 92a41f84f7 Fix wrong owner in the properties modal 2019-08-19 16:00:55 +02:00
ansuz bf3e638adc resolve merge conflicts, lint compliance 2019-08-16 16:02:10 +02:00
ClemDee f55c8c6b04 Open plain text files in code app && plain text files thumbnail 2019-08-13 16:09:06 +02:00
ansuz ecffe23c08
Merge pull request #424 from xwiki-labs/fixSharingSettings 
Fix edit mode not default for url in drive share modal
 2019-08-12 11:12:35 +02:00
ansuz c76c3130cb
Merge pull request #423 from xwiki-labs/downloadFilesFromPad 
Download files from pad
 2019-08-12 10:55:42 +02:00
ClemDee c3c918cce7 Fix classname of contextmenu options 2019-08-12 10:55:03 +02:00
ansuz da3763a14b
Merge pull request #422 from xwiki-labs/contextmenuIconsEverywhere 
Contextmenu icons everywhere
 2019-08-12 10:52:07 +02:00
ClemDee e29e105bb0 Add comment to get the code more friendly 2019-08-12 10:50:12 +02:00
ClemDee cc5d060bce Fix edit mode not default for url in drive share modal 2019-08-09 16:15:33 +02:00
ClemDee fb2da27115 Add download file from contextmenu in code and slide apps 2019-08-09 14:06:37 +02:00
ClemDee 73051ad30f Change save-in-your-cryptdrive icon on code contextmenu 2019-08-09 13:28:09 +02:00
ansuz 20815eb725
Merge pull request #416 from xwiki-labs/dontClickMoreThanOnceOnTheStorePadInDriveButton 
Dont click more than once on the store pad in drive button
 2019-08-08 17:22:11 +02:00
ClemDee eaae63f275 Correct stupid error 2019-08-08 17:21:00 +02:00
ClemDee 55d53cfac6 Prevent blocking UI if user disconnected 2019-08-08 16:42:21 +02:00
ClemDee c45b64ffe7 Change ctrl+E default modal to new-pad modal in drive 2019-08-06 16:39:58 +02:00
ClemDee b5a58b9604 Add contextmenu icons for code and slide app 2019-08-02 15:50:11 +02:00
ClemDee 83f6a29f15 Disallow to click more than once on the button to store a shared pad in drive 2019-07-25 14:50:46 +02:00
yflory 0636714829 Share with friends as template 2019-07-18 17:18:36 +02:00
yflory 4396fda0ff Remember share settings when sharing a pad with a friend 2019-07-18 16:58:57 +02:00
yflory b524643af4 Display the owners names in the properties modal when we can 2019-07-17 17:45:44 +02:00