 yflory
|
994eefaf63
|
Merge branch 'staging' into inviteUI
|
2019-12-18 18:10:50 +01:00 |
|
|
yflory
|
25b88afeea
|
Fix invitation links
|
2019-12-18 18:10:33 +01:00 |
|
|
yflory
|
f98543bb83
|
Add category icon for link invitation
|
2019-12-18 18:02:33 +01:00 |
|
|
yflory
|
7008c71605
|
Clean teams inner code
|
2019-12-18 17:46:44 +01:00 |
|
|
yflory
|
6945628cf1
|
handle error in team outer
|
2019-12-18 17:45:57 +01:00 |
|
|
yflory
|
97f322753a
|
Add owners to invitation channels
|
2019-12-18 17:12:29 +01:00 |
|
|
yflory
|
32fd1b4971
|
remove debugging console.error
|
2019-12-18 17:00:38 +01:00 |
|
|
yflory
|
1826d05e31
|
Keep cloned data when accepting team invitation
|
2019-12-18 16:58:02 +01:00 |
|
|
yflory
|
7db7db262c
|
Fix 'enter' key in team invite modal
|
2019-12-18 16:36:06 +01:00 |
|
|
yflory
|
563e2161c3
|
Merge branch 'staging' into inviteUI
|
2019-12-18 16:23:15 +01:00 |
|
|
yflory
|
032186cc4c
|
Fix unsanitized name in profile again
|
2019-12-18 16:15:33 +01:00 |
|
|
yflory
|
704d42d169
|
Fix unsanitized name in profile
|
2019-12-18 16:08:22 +01:00 |
|
|
yflory
|
e6e1ef72e7
|
Merge branch 'staging' into inviteUI
|
2019-12-18 15:12:43 +01:00 |
|
|
yflory
|
a34aad78ab
|
Remove duplicate code
|
2019-12-18 15:12:33 +01:00 |
|
|
yflory
|
a817242fe5
|
Fix join team for anon users
|
2019-12-18 13:05:01 +01:00 |
|
|
yflory
|
8eed376274
|
Fix default category after joining a team
|
2019-12-18 12:42:24 +01:00 |
|
|
yflory
|
efa56e5fbc
|
lint compliance
|
2019-12-18 12:32:13 +01:00 |
|
|
yflory
|
404f5fb4da
|
Handle max teams slots with link invitation
|
2019-12-18 12:29:39 +01:00 |
|
|
yflory
|
fc8ee58cfb
|
Fix joinTeam undefined data
|
2019-12-18 12:09:41 +01:00 |
|
|
yflory
|
b58901e229
|
Fix link generation
|
2019-12-18 12:04:36 +01:00 |
|
|
yflory
|
0574bd9286
|
Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI
|
2019-12-18 11:37:21 +01:00 |
|
|
yflory
|
a5f88c505d
|
lint compliance
|
2019-12-18 11:37:17 +01:00 |
|
|
yflory
|
400b39d46a
|
Join a team from a link
|
2019-12-18 11:35:39 +01:00 |
|
|
yflory
|
3d1b3b5d18
|
Fix RPC data
|
2019-12-18 10:52:20 +01:00 |
|
|
yflory
|
906b315487
|
Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI
|
2019-12-18 10:42:03 +01:00 |
|
|
yflory
|
fc651747ca
|
Fix error message not displayed when creating a invitation link
|
2019-12-18 10:38:30 +01:00 |
|
|
yflory
|
5b8eb1c070
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-12-17 17:57:28 +01:00 |
|
|
yflory
|
215cabc053
|
Fix sidebar layout buttons in team drive
|
2019-12-17 17:57:07 +01:00 |
|
|
yflory
|
790c9aa0d7
|
Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI
|
2019-12-17 17:28:31 +01:00 |
|
|
yflory
|
cf2a624775
|
Add 'Join team' and 'Decline' buttons
|
2019-12-17 17:28:19 +01:00 |
|
|
yflory
|
d9ae669015
|
Handle deleted invitation error
|
2019-12-17 17:18:45 +01:00 |
|
|
yflory
|
55baf4ab29
|
Merge branch 'sidebarbuttons' of github.com:xwiki-labs/cryptpad into sidebarbuttons
|
2019-12-17 17:04:04 +01:00 |
|
|
yflory
|
4cc2da7222
|
Fix HTML message displayed as text in profile
|
2019-12-17 17:03:56 +01:00 |
|
|
yflory
|
0b248348eb
|
Fix mute/unmute button in contacts
|
2019-12-17 17:01:15 +01:00 |
|
|
yflory
|
64fba3e379
|
Merge branch 'mute' into sidebarbuttons
|
2019-12-17 14:28:37 +01:00 |
|
|
yflory
|
55acf9d4a0
|
Merge branch 'staging' into mute
|
2019-12-17 14:28:23 +01:00 |
|
|
yflory
|
3aa111d8a8
|
lint compliance
|
2019-12-17 11:49:32 +01:00 |
|
|
yflory
|
5174472329
|
Fix link generation bug
|
2019-12-17 11:48:23 +01:00 |
|
|
yflory
|
6a712a7b52
|
View pending invitation links and remove them (if admin)
|
2019-12-17 11:24:49 +01:00 |
|
|
yflory
|
35dbfe0bb5
|
Pin the invitation link channels
|
2019-12-17 11:17:31 +01:00 |
|
|
yflory
|
5a055233c0
|
Fix cryptget inner
|
2019-12-17 10:57:13 +01:00 |
|
|
yflory
|
e38d6d1093
|
Fix link generation
|
2019-12-17 10:29:02 +01:00 |
|
|
yflory
|
495cb4403b
|
Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI
|
2019-12-16 18:37:53 +01:00 |
|
|
yflory
|
0716014eef
|
Refactoring joining team from link
|
2019-12-16 18:36:34 +01:00 |
|
|
yflory
|
4626d036cb
|
Cryptget in common/invitation
|
2019-12-16 17:12:58 +01:00 |
|
|
yflory
|
cfb6318b86
|
Team invitation link, add alert
|
2019-12-16 16:06:22 +01:00 |
|
|
yflory
|
07ef60418b
|
Merge branch 'mute' into sidebarbuttons
|
2019-12-16 14:46:36 +01:00 |
|
|
yflory
|
47128802a2
|
Merge branch 'staging' into mute
|
2019-12-16 14:43:14 +01:00 |
|
|
yflory
|
b5193914e3
|
Add mute info in the profile app
|
2019-12-16 14:17:40 +01:00 |
|
|
yflory
|
f64c11dc3a
|
Fix profile app
|
2019-12-16 14:12:33 +01:00 |
|
|
yflory
|
7f5c5c18a3
|
Merge branch 'mute' into sidebarbuttons
|
2019-12-16 13:58:21 +01:00 |
|
|
yflory
|
ac5100b3b2
|
Update mute icon in profile
|
2019-12-16 13:57:49 +01:00 |
|
|
yflory
|
0ee6fcb6bc
|
Add unmute contacts button
|
2019-12-16 13:09:52 +01:00 |
|
|
yflory
|
9e08a97d72
|
Alertify buttons and inputs added to sidebar layout
|
2019-12-16 12:51:12 +01:00 |
|
|
yflory
|
fb8be19657
|
Fix buttons UI in contacts
|
2019-12-13 18:43:40 +01: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
|
510fd9a1a6
|
Merge branch 'master' into staging
|
2019-12-12 16:24:05 +01:00 |
|
|
yflory
|
d04d36c8cd
|
Merge branch 'master' into inviteUI
|
2019-12-12 16:23:53 +01:00 |
|
|
yflory
|
f2a84fba78
|
Merge branch 'soon'
|
2019-12-12 16:17:52 +01:00 |
|
|
yflory
|
5f0244beb3
|
Fix kanban UI issues
|
2019-12-12 16:09:07 +01:00 |
|
|
yflory
|
998e2f81d2
|
Invite to team modal
|
2019-12-12 15:30:14 +01:00 |
|
|
yflory
|
585138aeee
|
Fix links in profile description
|
2019-12-11 17:18:32 +01:00 |
|
|
yflory
|
3ecad6fa73
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2019-12-11 16:40:55 +01:00 |
|
|
yflory
|
32891be320
|
Fix export and username prompt
|
2019-12-11 16:40:39 +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 |
|
|
yflory
|
11ddb96422
|
Mute friends: dismiss notifications and fix UI issues
|
2019-12-10 13:07:57 +01:00 |
|
|
yflory
|
3528516ab9
|
Merge branch 'staging' into ooPassword
|
2019-12-09 16:05:24 +01:00 |
|
|
yflory
|
111141628c
|
lint compliance
|
2019-12-09 16:02:24 +01:00 |
|
|
yflory
|
73a03e8d80
|
Fix getFullHistory and getHistory errors
|
2019-12-09 15:05:03 +01:00 |
|
|
yflory
|
b558d6e354
|
Fix null item in kanban
|
2019-12-09 11:03:11 +01:00 |
|
|
yflory
|
bbf2e3a9ae
|
Mute and unmute users
|
2019-12-06 16:10:19 +01:00 |
|
|
yflory
|
f3b1761d0d
|
Enable openURL and gotoURL in the share iframe
|
2019-12-05 11:33:43 +01:00 |
|
|
yflory
|
fb50fe09ce
|
Merge branch 'master' into staging
|
2019-12-04 17:39:54 +01:00 |
|
|
yflory
|
366e45cac4
|
Merge branch 'soon'
|
2019-12-04 17:36:12 +01:00 |
|
|
yflory
|
f3d7a97c23
|
Fix contacts app
|
2019-12-04 17:34:28 +01:00 |
|
|
yflory
|
195de903e3
|
mkAsync getFileSize and getChannelList
|
2019-12-04 17:15:45 +01:00 |
|
|
yflory
|
cf298ccd89
|
Remove dev code and improve performances
|
2019-12-04 17:05:10 +01:00 |
|
|
yflory
|
ab3945db1f
|
temp
|
2019-12-04 13:37:46 +01:00 |
|
|
yflory
|
0b0ce98fc7
|
Kanban UI
|
2019-12-04 11:18:25 +01:00 |
|
|
yflory
|
187eb4afde
|
Load only one network to get history keeper ID from cryptget
|
2019-12-04 11:13:05 +01:00 |
|
|
yflory
|
69d8b413a6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-12-04 10:50:13 +01:00 |
|
|
yflory
|
ba74fc8d4f
|
Send warning to accounts when we can't update pin limit
|
2019-12-04 10:49:51 +01:00 |
|
|
yflory
|
198786ed90
|
Login from accounts
|
2019-12-03 10:37:47 +01: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
|
e4231956a3
|
Fix integrity checks
|
2019-11-29 14:44:11 +01:00 |
|
|
yflory
|
71d2f8388d
|
Rename a variable
|
2019-11-29 14:32:40 +01:00 |
|
|
yflory
|
cc4e6d9a1e
|
Fix integrity checks
|
2019-11-29 14:30:12 +01:00 |
|
|
yflory
|
03701f02e0
|
Remove debug logs
|
2019-11-29 10:46:34 +01:00 |
|
|
yflory
|
f2363f59ca
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-11-28 12:47:24 +01:00 |
|
|
yflory
|
d6d92531ea
|
Add finnish translation files
|
2019-11-28 12:46:12 +01:00 |
|
|
yflory
|
8a0e0621fb
|
Fast auth
|
2019-11-27 17:26:21 +01:00 |
|
|
yflory
|
3b6155ffce
|
Change properties icon in the drive
|
2019-11-27 13:14:33 +01:00 |
|
|
yflory
|
50886b81da
|
Update orgmode regex in codemirror #466
|
2019-11-27 11:31:49 +01:00 |
|
|
yflory
|
580731d560
|
Merge branch 'staging' into ooPassword
|
2019-11-26 16:13:41 +01:00 |
|