Commit Graph

26493 Commits

Author SHA1 Message Date
Joas Schilling 3f64e9423b Split logic and global usage and add tests for "searchSharees()" 2015-08-26 11:54:24 +02:00
Joas Schilling a66aa1fe02 Filter the sharees with the existing shares 2015-08-26 11:54:24 +02:00
Joas Schilling 4b08783946 Use SearchResultSorter 2015-08-26 11:54:24 +02:00
Joas Schilling 16e5c15c28 Add tests for "getRemote()" 2015-08-26 11:54:24 +02:00
Joas Schilling ad450d4f0e Add tests for "getGroups()" 2015-08-26 11:54:24 +02:00
Joas Schilling be257bc9cc Add tests for "getUsers()" 2015-08-26 11:54:24 +02:00
Joas Schilling 9b0058d2b0 Move test file to subdir 2015-08-26 11:54:24 +02:00
Roeland Jago Douma b2fbecc39f Empty skeleton for tests 2015-08-26 11:54:24 +02:00
Roeland Jago Douma 8a5c1e6d4d Sort sharees
To ensure that pagination is working properly we need to make sure the
shares are always in the same order.

Sorting is first done by label (catches most instances)
If there is a user and a group with the same label we sort by shareType
If there are multiple users with the same label we sort those by
shareWith
2015-08-26 11:54:24 +02:00
Roeland Jago Douma 98301210a9 Start of OCS Share API sharees endpoint 2015-08-26 11:54:23 +02:00
Morris Jobke 27af0e82dd Merge pull request #18042 from GreenArchon/master
Properly nest groups when using memberOf to detect group membership, …
2015-08-26 11:42:47 +02:00
Jan-Christoph Borchardt 7ed8c7f75c Merge pull request #18576 from owncloud/update-maintenance-color
Make maintenance/update text white
2015-08-26 11:30:07 +02:00
Vincent Petry 23aa44b6b5 Make maintenance/update text white
Removing the color makes it default to white as defined in the parent
style.
2015-08-26 11:04:39 +02:00
Jenkins for ownCloud 90e11ee005 [tx-robot] updated from transifex 2015-08-26 04:10:42 -04:00
Raghu Nayyar 08a490df32 Merge pull request #18569 from owncloud/files-dropdown-border
adjust dropdown borders to button borders
2015-08-26 12:36:28 +05:30
Thomas Müller 749e3d5219 Merge pull request #18553 from owncloud/write-l10n-on-login
Save detected l10n of browser on login
2015-08-26 08:44:25 +02:00
Thomas Müller 534b2e407a Merge pull request #17662 from owncloud/locking-db
Database backend for locking
2015-08-26 03:56:37 +02:00
Christoph Wurst d7ceb3a162 adjust dropdown borders to button borders 2015-08-25 22:59:15 +02:00
Morris Jobke b45ae1b32e Merge pull request #18522 from owncloud/lighter-fonts
move fonts from Regular+Bold to Light+Semibold for lighter feel
2015-08-25 22:38:55 +02:00
Morris Jobke e9241fcd8c Merge pull request #18562 from owncloud/explicit-use-statuscode-200
Explicitly specify status code 200 as response code
2015-08-25 22:02:27 +02:00
Morris Jobke 1ca638cfbd Merge pull request #18564 from owncloud/fix-transifex-sync
Update slug
2015-08-25 22:00:52 +02:00
Morris Jobke 6946edef5c Merge pull request #18554 from owncloud/fix-gs-share-master
Simply hide sharing buttons for IE8
2015-08-25 21:59:14 +02:00
Lukas Reschke e2bd026b2e Merge pull request #18558 from owncloud/ext-objectstore
Prevent objectstore being set from client side
2015-08-25 20:56:51 +02:00
Jenkins for ownCloud 2171cc02c3 [tx-robot] updated from transifex 2015-08-25 12:39:10 -04:00
Thomas Müller 891673d9ea Update slug 2015-08-25 18:29:34 +02:00
Lukas Reschke f3561e2349 Explicitly specify status code 200 as response code
Potentially fixes https://github.com/owncloud/core/issues/17586
2015-08-25 18:07:40 +02:00
Jan-Christoph Borchardt 840a2a7788 Merge pull request #18506 from owncloud/round-avatars
make profile photos round
2015-08-25 17:30:08 +02:00
Robin McCorkell 63218ec098 Prevent objectstore being set from client side 2015-08-25 16:14:31 +01:00
Jan-Christoph Borchardt a262be5141 Merge pull request #18550 from owncloud/mobile-shared-style
fix being able to distinguish shared items on mobile
2015-08-25 17:08:34 +02:00
Thomas Müller 5cf3170e89 don't load gs-share 2015-08-25 16:49:40 +02:00
Jan-Christoph Borchardt de13c3b577 make profile photos round 2015-08-25 16:17:26 +02:00
Jan-Christoph Borchardt 79567dcbc0 move fonts from Regular+Bold to Light+Semibold for lighter feel 2015-08-25 16:13:05 +02:00
Jan-Christoph Borchardt 1efbc99365 Merge pull request #18543 from owncloud/remove-lines
Remove some lines
2015-08-25 16:08:06 +02:00
Jan-Christoph Borchardt 441a608fd0 Merge pull request #18552 from owncloud/triangle-icons
adjust style of triangle and caret icons
2015-08-25 16:06:33 +02:00
Thomas Müller fcde0234b7 Simply hide sharing buttons for IE8 - fixes #18011 2015-08-25 16:05:57 +02:00
Jan-Christoph Borchardt 8998cf517d adjust style of triangle and caret icons 2015-08-25 16:04:47 +02:00
Morris Jobke c16113ea37 Merge pull request #18545 from owncloud/button-style
remove border from button style
2015-08-25 16:02:40 +02:00
Morris Jobke 4f13f96981 Save detected l10n of browser on login
* fixes owncloud/activity#373
2015-08-25 15:47:31 +02:00
Vincent Petry 1dc9283413 Merge pull request #18538 from owncloud/sidebar-improvements
Fix sidebar for trashbin and others
2015-08-25 14:57:41 +02:00
Jan-Christoph Borchardt cc898cf346 fix being able to distinguish shared items on mobile 2015-08-25 14:45:39 +02:00
Thomas Müller 6f6a5f6c29 Adding path to log message 2015-08-25 14:31:21 +02:00
Jan-Christoph Borchardt d337c2bf0e remove border from button style 2015-08-25 14:22:00 +02:00
Jan-Christoph Borchardt 3cfbf77866 reduce files table header line 2015-08-25 14:14:53 +02:00
Jan-Christoph Borchardt 29c538c667 replace apps navigation line with whitespace 2015-08-25 14:06:20 +02:00
Jan-Christoph Borchardt cf53137911 replace section line with whitespace 2015-08-25 14:06:05 +02:00
Vincent Petry 010c03fc30 Fix row highlight in other file lists 2015-08-25 12:05:04 +02:00
Morris Jobke 494c1d7417 Merge pull request #18440 from owncloud/ext-backends.customjs
Migrate custom JS external storage backends to new registration API [part 2]
2015-08-25 11:52:56 +02:00
Vincent Petry 5e6fa3c938 Fix trashbin sidebar
Do not display size as it is not available.
Use display name instead of name to remove the ".d123456" suffix.
2015-08-25 11:29:35 +02:00
Vincent Petry a86602a157 Properly hide sidebar when switching between files app sections
Since there are multiple sidebars, one for each files app section, we
need to hide the correct ones.
2015-08-25 11:07:47 +02:00
Thomas Müller 2f86be9ced Merge pull request #18523 from owncloud/crazy-scanner
Prevent bkg scanner going crazy with unavailable storages (ajax/scan.php)
2015-08-25 09:23:42 +02:00