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
|
d2ba375491
|
Improve profile UI
|
2019-12-19 10:34:08 +01:00 |
|
ansuz
|
ceb7fc4f66
|
remove XXX notes which have been addressed
|
2019-12-18 18:18:14 -05:00 |
|
ansuz
|
f4072ae817
|
Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI
|
2019-12-18 12:02:52 -05:00 |
|
ansuz
|
90d8a7a684
|
remove an unused dependency
|
2019-12-18 12:02:26 -05:00 |
|
yflory
|
7db7db262c
|
Fix 'enter' key in team invite modal
|
2019-12-18 16:36:06 +01:00 |
|
yflory
|
e6e1ef72e7
|
Merge branch 'staging' into inviteUI
|
2019-12-18 15:12:43 +01:00 |
|
yflory
|
8eed376274
|
Fix default category after joining a team
|
2019-12-18 12:42:24 +01:00 |
|
yflory
|
3d1b3b5d18
|
Fix RPC data
|
2019-12-18 10:52:20 +01:00 |
|
yflory
|
fc651747ca
|
Fix error message not displayed when creating a invitation link
|
2019-12-18 10:38:30 +01:00 |
|
David Benqué
|
d2ea3c4221
|
show form and switch buttons if error
|
2019-12-17 11:18:38 +00:00 |
|
David Benqué
|
4f8ca40d36
|
hide and show buttons to create/copy link
|
2019-12-17 10:30:44 +00:00 |
|
David Benqué
|
71da3ed723
|
add button keys
|
2019-12-16 16:51:53 +00:00 |
|
David Benqué
|
01e7ec7e88
|
Merge remote-tracking branch 'origin/inviteUI' into inviteUI
|
2019-12-16 16:09:40 +00:00 |
|
David Benqué
|
4173bf168f
|
alert margins
|
2019-12-16 16:05:59 +00:00 |
|
David Benqué
|
fccd1d5cc0
|
resize spinner
|
2019-12-16 16:05:41 +00:00 |
|
David Benqué
|
8b333a8147
|
size message textarea and remove resize
|
2019-12-16 16:05:06 +00:00 |
|
David Benqué
|
00b0499db5
|
add translation keys
|
2019-12-16 16:03:56 +00:00 |
|
ansuz
|
6686e0e841
|
Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI
|
2019-12-16 10:22:44 -05:00 |
|
ansuz
|
af463c2de9
|
use the same APIs when creating invites as you do when redeeming them
|
2019-12-16 10:22:22 -05:00 |
|
yflory
|
cfb6318b86
|
Team invitation link, add alert
|
2019-12-16 16:06:22 +01:00 |
|
yflory
|
47128802a2
|
Merge branch 'staging' into mute
|
2019-12-16 14:43:14 +01:00 |
|
ansuz
|
4a83103f52
|
WIP invitation API
|
2019-12-13 18:38:05 -05: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
|
998e2f81d2
|
Invite to team modal
|
2019-12-12 15:30:14 +01:00 |
|
yflory
|
aa8dd95310
|
Add unfriend, mute and unmute buttons in profile
|
2019-12-11 13:28:07 +01:00 |
|
yflory
|
e169e02d94
|
Use large icons in team invite usergrid
|
2019-12-10 16:27:15 +01:00 |
|
David Benqué
|
8293a125a9
|
add label to contacts list
|
2019-12-10 13:41:55 +00:00 |
|
yflory
|
11ddb96422
|
Mute friends: dismiss notifications and fix UI issues
|
2019-12-10 13:07:57 +01:00 |
|
David Benqué
|
516181acf2
|
fix buttons for no contacts
|
2019-12-09 16:21:48 +00:00 |
|
David Benqué
|
b6228421f6
|
Merge branch 'staging' into get_contacts
|
2019-12-09 16:17:04 +00:00 |
|
David Benqué
|
06f46129fc
|
add functionality to buttons for no contacts
|
2019-12-09 16:16:13 +00:00 |
|
yflory
|
3528516ab9
|
Merge branch 'staging' into ooPassword
|
2019-12-09 16:05:24 +01:00 |
|
David Benqué
|
1f48ee36ef
|
linting
|
2019-12-09 14:15:38 +00:00 |
|
David Benqué
|
e8b2c5c4e8
|
use secondary buttons
|
2019-12-09 14:01:15 +00:00 |
|
ansuz
|
8879c6b583
|
Merge pull request #474 from xwiki-labs/design_dialogs_passwords
Design dialogs passwords
|
2019-12-09 08:36:21 -05:00 |
|
David Benqué
|
df9f2c9c29
|
dismiss warning about sharing links
- remember if warning has been dismissed
- include this in tips that can be reset
- move the option to reset tips to the account settings
|
2019-12-09 11:14:05 +00:00 |
|
David Benqué
|
be40254f1a
|
remove spaces in password messages
- space between icon and text is now a margin
|
2019-12-09 10:02:44 +00:00 |
|
David Benqué
|
9b5c3878b1
|
add password messages to file share modal
|
2019-12-09 09:57:41 +00:00 |
|
David Benqué
|
713d67439f
|
review
|
2019-12-06 16:52:53 +00:00 |
|
David Benqué
|
72a855aa6a
|
change link alert to warning
|
2019-12-06 15:35:10 +00:00 |
|
David Benqué
|
15a8054d31
|
show messages when user has no contacts
cases:
- No contacts, logged in: show button to copy profile URL
- Not logged in: show buttons to log in or register
|
2019-12-06 12:01:27 +00:00 |
|
David Benqué
|
0e4b7623ff
|
adjust spacing
- fixed spacing to work also in properties modal
|
2019-12-05 15:52:16 +00:00 |
|
David Benqué
|
bee6aa42bf
|
add inline alert in link tab
|
2019-12-05 14:57:18 +00:00 |
|
David Benqué
|
78488d00bf
|
adjust spacing
|
2019-12-05 14:56:01 +00:00 |
|
David Benqué
|
0be5b90495
|
avoid underlined space at start of FAQ link
|
2019-12-05 11:28:46 +00:00 |
|
David Benqué
|
708ad7a10d
|
linting
|
2019-12-05 11:19:46 +00:00 |
|
David Benqué
|
22873fe1f7
|
adjustments to FAQ password links
|
2019-12-05 11:16:12 +00:00 |
|
David Benqué
|
e138dc8c6a
|
display embed code in textarea
|
2019-12-05 10:58:54 +00:00 |
|
David Benqué
|
951a59f3ea
|
add password FAQ links to share modal tabs
|
2019-12-05 10:55:52 +00:00 |
|
David Benqué
|
1d2f40e6cc
|
try to add link to password FAQ
|
2019-12-05 10:10:48 +00:00 |
|
David Benqué
|
ee35c1d151
|
display share link in textarea
|
2019-12-04 12:46:56 +00:00 |
|
David Benqué
|
1ba03dee45
|
position and style alert
|
2019-12-04 11:41:08 +00:00 |
|
David Benqué
|
5b18e3a633
|
Merge branch 'design_dialogs_usergrid' into design_dialogs_passwords
|
2019-12-04 11:29:15 +00:00 |
|
David Benqué
|
a38fa71d57
|
use translation key for alert message
|
2019-12-03 14:52:46 +00:00 |
|
David Benqué
|
3b7732ceb2
|
display alert in link tab
|
2019-12-03 12:01:31 +00:00 |
|
David Benqué
|
2f087a392a
|
clean up XXXes
|
2019-12-03 11:03:57 +00:00 |
|
David Benqué
|
5657793e9c
|
use .large avatars in manage owners
|
2019-12-03 10:25:56 +00:00 |
|
David Benqué
|
26c681c3cb
|
remove padding in prop modal
- caused a vertical scrollbar
- now constructed like the share modal (customModals inside tabs)
|
2019-12-03 10:11:52 +00:00 |
|
David Benqué
|
1da5e8ac3c
|
usergrid avatar display and scrolling
|
2019-12-02 11:34:34 +00:00 |
|
yflory
|
d52acfa5d2
|
Change initial tab in the file share modal
|
2019-11-29 17:02:02 +01:00 |
|
yflory
|
e35b1712c3
|
Change initial tab in the share modal
|
2019-11-29 16:47:18 +01:00 |
|
yflory
|
580731d560
|
Merge branch 'staging' into ooPassword
|
2019-11-26 16:13:41 +01:00 |
|
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 |