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

1996 Commits

Author SHA1 Message Date
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 7f5c5c18a3 Merge branch 'mute' into sidebarbuttons 2019-12-16 13:58:21 +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
ansuz 294fb5acb5 update version string 2019-12-09 11:24:47 -05:00
David Benqué bc59313238 lint 2019-12-09 11:37:20 +00:00
David Benqué f04d4e1010 adjust spacing of usergrid 2019-12-09 11:34:00 +00:00
David Benqué e9c0e1a710 icon spacing 2019-12-09 11:15:52 +00:00
David Benqué 713d67439f review 2019-12-06 16:52:53 +00:00
yflory bbf2e3a9ae Mute and unmute users 2019-12-06 16:10:19 +01:00
David Benqué 0e4b7623ff adjust spacing 
- fixed spacing to work also in properties modal
 2019-12-05 15:52:16 +00:00
David Benqué 78488d00bf adjust spacing 2019-12-05 14:56:01 +00:00
David Benqué 9ec2dd8e70 remove grey bg on password reveal eye btn 2019-12-05 11:46:34 +00:00
David Benqué 708ad7a10d linting 2019-12-05 11:19:46 +00:00
David Benqué 5d599887cf style links in bootsstrap alerts 2019-12-05 11:02:09 +00:00
David Benqué e138dc8c6a display embed code in textarea 2019-12-05 10:58:54 +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é 3b7732ceb2 display alert in link tab 2019-12-03 12:01:31 +00:00
David Benqué 63c5fddf38 lint 2019-12-03 11:07:18 +00:00
David Benqué 2f087a392a clean up XXXes 2019-12-03 11:03:57 +00:00
David Benqué d7b3a5ce67 adjust default avatar colors 2019-12-03 10:43:27 +00:00
David Benqué 5657793e9c use .large avatars in manage owners 2019-12-03 10:25:56 +00:00
David Benqué ee1371c8ba try to get rid of vertical scroll 2019-12-03 09:38:39 +00:00
David Benqué 1da5e8ac3c usergrid avatar display and scrolling 2019-12-02 11:34:34 +00:00
yflory d6d92531ea Add finnish translation files 2019-11-28 12:46:12 +01:00
David Benqué 66073804ee remove rounded corners on avatars 2019-11-26 11:50:34 +00:00
David Benqué 01d7d21754 Merge branch 'staging' into design_dialogs_usergrid 2019-11-25 17:05:00 +00:00
yflory 77ee1b02dc Add missing margin in usergrid 2019-11-25 17:58:33 +01:00
yflory 09fdfa2ad2 Fix usergrid UI issues 2019-11-25 17:54:22 +01:00
yflory bf6681c5e6 Better spacing between items in usergrid 2019-11-25 17:43:55 +01:00
ansuz a1f25d937c bump version to 3.6.0 (GoldenFrog) 2019-11-25 10:51:46 -05:00
David Benqué f826e6aa3b align filter input and buttons 2019-11-25 15:42:26 +00:00
David Benqué ef857dbe75 Merge branch 'design_dialogs_props' into design_dialogs_usergrid 2019-11-25 13:14:40 +00:00
yflory 5de5bb603d Merge branch 'staging' into design_dialogs_props 2019-11-25 12:17:03 +01:00
yflory bfd2ca85b5 Merge branch 'design_dialogs' into staging 2019-11-25 10:59:10 +01:00
David Benqué baf911c3c2 lint 2019-11-25 09:49:14 +00:00
David Benqué 5d7886325d style secondary and cancel buttons 2019-11-25 09:48:08 +00:00
yflory 7e45f597c9 Merge branch 'design_dialogs' into staging 2019-11-22 17:26:53 +01:00
David Benqué 09b07de6f2 lint 2019-11-22 16:10:24 +00:00
David Benqué 9a67537080 Merge branch 'design_dialogs' into design_dialogs_props 2019-11-22 16:09:09 +00:00
David Benqué 754fa9dab2 review and lint 2019-11-22 16:03:17 +00:00
David Benqué 1703186ebf correct readonly selector 2019-11-22 14:58:22 +00:00
David Benqué 57ba4e0bcd address XXX issues 2019-11-22 11:34:13 +00:00
yflory 9f903b645a ckeditor wordcount 2019-11-22 12:20:07 +01:00
David Benqué b39f3b553e re-remove text fields in properties modal 2019-11-22 11:16:48 +00:00
David Benqué e2b3cf3ccc fix text-input colors 2019-11-22 09:52:21 +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é 8cfc108276 text input styling 
differentiate between input and readonly
 2019-11-21 15:33:15 +00:00
David Benqué 6a663c5d35 re-re-align buttons 2019-11-21 15:16:25 +00:00
David Benqué cc5d6260dc re-align buttons and modal content 2019-11-21 15:09:38 +00:00
David Benqué 2a23359d8f fix import of modals-ui-elements 2019-11-21 14:31:57 +00:00
David Benqué 9f3aa25fdd move modal styles to new file 2019-11-21 13:50:46 +00:00
David Benqué 8a11cf9b38 style share modal 2019-11-21 12:29:23 +00:00
yflory dc6ca9098e Improve small screen detection in toolbar 2019-11-21 11:24:51 +01:00
yflory 2fd31e8d89 Improve password prompt UI 2019-11-18 10:56:24 +01:00
David Benqué 4abef31a9c de-activate dutch awaiting translation 2019-11-12 10:36:35 +00:00
David Benqué 673c629b5b add dutch language files 2019-11-12 10:32:28 +00:00
ansuz 86bc0bcae7 lint compliance 2019-11-08 11:54:07 -05:00
ansuz 10db91e006 bump platform version 2019-11-08 11:41:38 -05:00
David Benqué b5f0c18975 Merge branch 'tippy-prune' into staging 2019-11-08 14:49:06 +00:00
yflory 553f68fce8 Merge branch 'filePassword' into staging 2019-11-08 15:28:50 +01:00
David Benqué 042f9fe684 add storage info and change bar 2019-11-08 10:24:07 +00:00
David Benqué ac1d166231 fix upgrade button alignment 2019-11-07 11:55:35 +01:00
David Benqué c653c777c5 fix quota bar and upgrade buttons 
button alignments and margin
bar border, radius, and removed text shadow
 2019-11-07 11:37:40 +01:00
yflory 76c17f25ca Fix alertify buttons with small screens 2019-11-07 10:33:57 +01:00
yflory 567b5b8fbe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-11-06 16:26:40 +01:00
yflory c12f747b3d Fix share button icon position in the drive 2019-11-06 16:26:27 +01:00
David Benqué 252402c8e4 adjust tooltip style 2019-11-06 16:24:57 +01:00
ansuz d4e6bc780b fix an overly broad CSS selector for notifications 
Unfortunately it was breaking some useful behaviour in the slide app
 2019-11-05 11:19:44 -05:00
yflory f39266b7c3 Add an example in application_config.js (#458) 2019-10-29 14:40:22 +01:00
yflory 289f71ae8b Merge branch 'staging' into ro 2019-10-28 15:10:29 +01:00
yflory 93e4c8a9e2 bump version 2019-10-28 13:45:54 +01:00
yflory 9477ae0895 Merge branch 'sfPassword' into ro 2019-10-22 17:26:32 +02:00
yflory 456c88b22c Merge branch 'staging' into sfPassword 2019-10-22 14:54:24 +02:00
yflory b2f89e289d Merge branch 'sfPassword' into ro 2019-10-21 17:43:46 +02:00
yflory 7d7a692383 Display a password prompt when an unprotected pad is not found on the server 2019-10-21 17:12:36 +02:00
yflory 302030e1ee Shared folder password change 2019-10-21 15:23:13 +02:00
yflory ad42d956d7 Add support for Japanese translation 2019-10-21 11:10:30 +02:00
yflory 7c710e57b7 Read-only shared folders UI 2019-10-14 16:02:24 +02:00
yflory 67c71ce4d1 Fix UI issues in teams 2019-10-08 15:02:30 +02:00
yflory 78bd544196 bump version 2019-10-08 13:54:48 +02:00
yflory 6c08a66404 Drive UI 2019-10-07 10:36:31 +02:00
yflory db2f233c44 Fix various team UI issues 2019-10-04 17:31:12 +02:00
yflory 390ca941e7 Add links to the CryptPad survey and to the crowdfunding page 2019-10-03 18:09:20 +02:00
yflory 56d8b92c99 Make team drive leftside menu collapsable 2019-10-01 14:10:44 +02:00
yflory 1a69a0cab7 Add links to the teams APP 2019-10-01 10:57:46 +02:00
ansuz 9b74136b66 Merge branch 'invitations' into staging 2019-09-30 10:53:10 +02:00
yflory c0a0275fd3 Add missing file 2019-09-27 12:10:50 +02:00
ansuz 6425d492f1 move credential.js from customize.dist/ to www/common/ 2019-09-27 12:04:31 +02:00
yflory a73af811d3 Make user grid layout reusable 2019-09-26 12:53:02 +02:00
yflory 0bb536bf13 Remove team selection from the PCS 2019-09-24 18:09:07 +02:00
yflory 17fbaea5d0 Disable Polish language 2019-09-23 15:15:53 +02:00
yflory 78022fa527 Merge branch 'staging' into team 2019-09-23 11:35:20 +02:00
ansuz 33623bdafc update version strings 2019-09-23 11:13:17 +02:00
yflory e4e2c3a19d Team invitation 2019-09-20 15:27:20 +02:00
yflory 1029ca0a8e Share modal UI 2019-09-18 16:15:45 +02:00
yflory 81c2df389a Team chat 2019-09-17 11:05:32 +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 79ac44de7e Fix team drive toolbar ui 2019-09-12 14:06:35 +02:00
yflory 798296489a Merge branch 'staging' into team 2019-09-10 15:32:05 +02:00
ansuz d83c43b0eb increment version to 3.1.0 2019-09-09 16:00:59 +02:00
yflory dbe63f254a Merge branch 'staging' into team 2019-09-09 15:39:28 +02:00
yflory f60e7ffd19 Transfer ownership UI 2019-09-09 11:02:08 +02:00
yflory 834e12fcba Teams: async-store refactoring 2019-09-06 15:45:56 +02:00
yflory 1a8f47d558 Add Team app 2019-09-04 16:08:53 +02:00
yflory 37b3c2f10c Split drive inner.js and less 2019-09-04 16:00:16 +02:00
yflory a6a40c3f6a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-09-03 17:05:23 +02:00
yflory e15b57989b Fix UI issues 2019-09-03 16:40:09 +02:00
ansuz 31c6e7241e Merge branch 'soon' into staging 2019-09-02 15:25:20 +02:00
ansuz 4e5f6edac4 update version to 3.0.1 for a minor release 2019-09-02 11:58:43 +02:00
yflory e131661673 Accept and decline ownership offers 2019-08-30 17:36:27 +02:00
ansuz 1ab4fd7952 advise users against using their emails as their username 2019-08-30 16:05:04 +02:00
yflory f6762f7c01 Make the friends list from the share modal reusable 2019-08-28 15:29:38 +02:00
yflory 3c8b9a55e0 Add background color to plain text media tags in the markdown apps 2019-08-27 11:16:25 +02:00
ansuz eb6a7f9262 update footer and package.json version to 3.0.0 2019-08-27 10:28:08 +02:00
yflory 2367a60236 Features pages UI 2019-08-26 17:18:28 +02:00
yflory e3e4186f34 Remove placeholder 2019-08-23 16:20:50 +02:00
yflory c95db33157 Improve pricing visibility 2019-08-23 16:19:45 +02:00
yflory 3c6e127831 Improve upload table UI 2019-08-22 18:04:11 +02:00
Clément Desableau e1477bd32e Make context submenus don't overflow on Y axis 2019-08-20 01:58:49 +02:00
ansuz 1521220560 fix loading screen spinner color to match CryptPad icon 2019-08-19 17:32:37 +02:00
ansuz 04feef793b resolve merge conflicts 2019-08-16 17:39:22 +02:00
ClemDee 6bcf9f13d3 Merge branch 'staging' into responsiveContextmenu 2019-08-12 12:16:07 +02:00
ClemDee a9aadb77e5 Tweaked submenu dropdown arrow 2019-08-07 12:25:50 +02:00
ClemDee 3f480635fa Fix submenu left position 2019-08-07 10:30:21 +02:00
ClemDee ef95da707e Modify upload panel style 2019-07-29 11:22:52 +02:00
ClemDee 666fbe098d Change loading spinner to custom spinner 2019-07-25 15:55:20 +02:00
yflory f9162d41f7 Fix translation keys 2019-07-17 12:15:28 +02:00
yflory 1bb47e28ef Update icons 2019-07-17 12:00:55 +02:00
yflory c72bffeb66 Update icons 2019-07-17 10:58:30 +02:00
yflory 9b45f0dd79 Add translation keys 2019-07-16 17:29:55 +02:00
ansuz 677a1594a5 wrap long lines in the support page 2019-07-10 10:25:40 +02:00
yflory e728b5aeeb Merge branch 'cryptDriveStuff' into staging 2019-07-04 14:04:18 +02:00
ClemDee 51b739bb8d Fix contextmenu icons width 2019-07-04 13:46:43 +02:00
ClemDee b2d2fa4e46 Merge branch 'notifications' of github.com:xwiki-labs/cryptpad into notifications 2019-07-04 11:43:26 +02:00
ClemDee 0ce9ed1d30 Change Open-notification-panel button style 2019-07-04 11:41:54 +02:00
yflory b548d30afe Merge branch 'staging' into notifications 2019-07-04 10:56:43 +02:00
yflory 1f384c2a4a update version 2019-07-03 16:36:04 +02:00
yflory baa0e7080a Merge branch 'staging' into notifications 2019-07-03 16:30:33 +02:00
yflory 5bd2f83ebd Revert "Make sidebar-layout responsive" 
This reverts commit bb5104dc0c.
 2019-07-03 15:58:06 +02:00
yflory 4b54bd220a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-07-03 15:56:38 +02:00
yflory b74e28fed3 Merge branch 'staging' into cryptDriveStuff 2019-07-03 15:42:43 +02:00
ClemDee a6f5652423 Add dropdown submenu 2019-07-03 13:52:10 +02:00