mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
44,808 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

44808 Commits

Author SHA1 Message Date
Bjoern Schiessle 7bdedfba48
explicitely mention that the note column can be null 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle eab4d96c4c
some small template fixes 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle 94c7052482
allow 'note' to be null 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle b81962e3e8
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle 2250dbec21
add a nice looking button as direct link to the sharre 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle 1ce519ad38
add direct link to the share 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle b56ccef564
add direct link to the file for user/group shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle a29261175d
fix mail templates 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle 4f59c8e8ae
show note on public link page 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle 73b88deeb8
add note to share object when reading it from the db 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle c116d116fa
improve mail template and escape html code 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle a93f2a648b
allow to add a personal note to a share 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Nextcloud bot cce12f0ca3
[tx-robot] updated from transifex 2018-07-21 00:12:01 +00:00
Morris Jobke 53aaa62572
Merge pull request #9982 from nextcloud/global-flow-rebuild 
Cleanup structure
 2018-07-20 23:40:00 +02:00
John Molakvoæ (skjnldsv) 89ee10a536
Jsunit fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-20 23:38:49 +02:00
John Molakvoæ (skjnldsv) 4877cd050b
Bump karma config 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-20 23:38:04 +02:00
John Molakvoæ (skjnldsv) 8d3f58c391
Jsunit fixes 1 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-20 23:38:04 +02:00
John Molakvoæ (skjnldsv) 43ab2082db
Fixed filestable min-width 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-20 23:38:04 +02:00
Jan-Christoph Borchardt a9f65390f6
Widen left navigation to 300px and set max-width of right sidebar to 500px 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-20 23:38:04 +02:00
John Molakvoæ (skjnldsv) ecaf4d7008
Fix sidebar close button 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-20 23:38:04 +02:00
John Molakvoæ (skjnldsv) e27e430f1f
use flex for main content 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-20 23:38:04 +02:00
John Molakvoæ (skjnldsv) 562e2aa30b
Adjust acceptance tests to sidebar changes in Files app 
Before, each section of the Files app ("All files", "Favorites"...) had
its own sidebar element. Now there is a single sidebar element for all
the sections in the Files app.

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-20 23:38:03 +02:00
John Molakvoæ (skjnldsv) fe6f444928
Fixed sticky controls 
since controls are not directly into the scollable element (app-content)
we need to make the parent the scrollable element (app-content-files)

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-20 23:37:00 +02:00
John Molakvoæ (skjnldsv) d6b718584e
Sidebar fix 
Fix sidebar and scrollbar on content
Sidebar fixes, and sidebar-width + header-height variables

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-20 23:37:00 +02:00
John Molakvoæ (skjnldsv) 842583038b
Cleanup structure 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-20 23:35:21 +02:00
Morris Jobke 52ec71c4b0
Merge pull request #10311 from nextcloud/bugfix/8702/ie11-icon-white 
Add icon-black-white mixin to automatically generate icon classes
 2018-07-20 20:27:49 +02:00
Julius Härtl 7b8ee2730b
Move icons over to the new mixin 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-20 17:44:35 +02:00
Morris Jobke 700aafb3ee
Merge pull request #10283 from nextcloud/bugfix/10094/user-management 
User management polishing
 2018-07-20 17:31:10 +02:00
Julius Härtl 4d5c01e066
Fix accceptance tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-20 16:49:05 +02:00
Julius Härtl 784eef16f6
Bump settings build 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-20 14:39:20 +02:00
Julius Härtl 0a14157c3b
Add some responsiveness to the user management 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-20 14:37:42 +02:00
Julius Härtl a28a8f1ccb
Fix cut-off name input field 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-20 14:37:41 +02:00
Julius Härtl 160ede24f6
Remove reset button from new user form 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-20 14:37:41 +02:00
Julius Härtl fd9bc638a3
Adjust user table font color 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-20 14:37:41 +02:00
Julius Härtl c5e82fc21c
Only show groups header in the sidebar, if groups are available 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-20 14:37:41 +02:00
Julius Härtl 1a0792b083
Hide no more results note 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-20 14:37:41 +02:00
Julius Härtl 527a90367a
Fix user management field label naming 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-20 14:37:41 +02:00
Julius Härtl 46be8e69c7
Add icon-black-white mixin to automatically generate icon classes 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-20 12:49:16 +02:00
Roeland Jago Douma a2df728fb8
Merge pull request #9581 from nextcloud/dav-acl-no-files 
disable dav acl plugin for files resource
 2018-07-20 12:16:45 +02:00
Morris Jobke 4536635e2a
Merge pull request #10229 from nextcloud/feature/noid/allow-notifiers-to-know-if-we-prepare-push-notifications 
Allow notifiers to know if we prepare push notifications
 2018-07-20 11:53:12 +02:00
Morris Jobke e0d9c43c95
Merge pull request #8188 from arnowelzel/master 
Avoid error messages for restricted opcache API
 2018-07-20 11:48:44 +02:00
Roeland Jago Douma c6b0df6710
Merge pull request #10290 from weeman1337/fix-10234-delete-empty-groups 
Fixes delete empty groups
 2018-07-20 11:22:03 +02:00
Michael Weimann 37e0f85ad0 Adds tests for testing removing an empty group 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-07-20 09:51:23 +02:00
Joas Schilling 6b440cc365
Merge pull request #10296 from nextcloud/bug/noid/dont_fail_on_unkown_user 
Don't fail contacts menu on unkown user
 2018-07-20 03:08:32 +02:00
Nextcloud bot a927d2fc08
[tx-robot] updated from transifex 2018-07-20 00:12:09 +00:00
Morris Jobke b033669894
Merge pull request #10299 from nextcloud/fs-mtime-index 
Add filecache index on mtime
 2018-07-19 23:57:41 +02:00
Morris Jobke 4751f1e7f7
Merge pull request #9984 from nextcloud/inverted-svg-api 
Svg color api
 2018-07-19 23:54:29 +02:00
Roeland Jago Douma 9d94cc1697
Fix unit tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-19 23:18:35 +02:00
John Molakvoæ (skjnldsv) 37a4d2bbbc
Php code bump 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 22:46:32 +02:00
Morris Jobke 8032e362ec
Merge pull request #10291 from nextcloud/bugfix/10052/fix-lotus-notes 
EMailTemplate: Fix button background in Lotus Notes
 2018-07-19 19:47:22 +02:00