summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Backport of #17723 to stable7Arthur Schiwon2015-07-202-156/+164
| | | | fix runtime caching in ldap's user manager, fixes #17631
* Only rescan versions once in trashbinVincent Petry2015-07-141-3/+13
| | | | | Whenever versions need to be rescanned, only do it once per PHP request. Happens whenever multiple files need to be expired.
* Merge pull request #17208 from owncloud/stable7-fix-16812C. Montero Luque2015-07-021-0/+21
|\ | | | | [Stable7] Oracle workaround for adding a column with not-null default value
| * Oracle-specific workaround for adding a column with not-null default valueVictor Dubiniuk2015-06-271-0/+21
| |
* | Merge pull request #17319 from owncloud/stable7-clean-ocsidMorris Jobke2015-07-026-6/+6
|\ \ | | | | | | [stable7] Delete OCS ID from DB if none is specified
| * | Bump versionsLukas Reschke2015-07-026-6/+6
| |/
* / [stable7] Remove OCS IDsLukas Reschke2015-07-026-6/+0
|/ | | | | | While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307 Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867
* [sharing] handle shares of users that aren't available anymoreMorris Jobke2015-06-231-1/+7
| | | | | * properly handle the case where an abandoned share is left and simply skip it
* Merge pull request #17034 from owncloud/backport-16890-stable7Morris Jobke2015-06-232-5/+10
|\ | | | | Backport of #16890 to stable7
| * Backport of #16890 to stable7Arthur Schiwon2015-06-182-5/+10
| | | | | | | | | | | | | | | | | | the user is gone, userExists will not bring him back. But the user's folder needs to be deleted anyway delete user test to take getHome into account to ensure it is also deleted subsequently Conflicts: apps/user_ldap/tests/user_ldap.php
* | skip users that are not available anymore during sharing upgradeMorris Jobke2015-06-231-1/+7
| |
* | Verify if path existsLukas Reschke2015-06-181-0/+4
|/ | | | We need to check if the path exists and throw an error instead of handling this situation ungraciously.
* Throw nicer error message instead 500Lukas Reschke2015-06-171-1/+3
|
* Verify if path existsLukas Reschke2015-06-171-0/+5
| | | | We need to verify if the specified path exists to gracefully prevent errors.
* Merge pull request #16864 from owncloud/backport-concatenation-7Thomas Müller2015-06-111-3/+3
|\ | | | | [stable7] Don't use command concatenation
| * Don't use command concatenationLukas Reschke2015-06-101-3/+3
| | | | | | | | Possibly fixes https://github.com/owncloud/core/issues/16853
* | Disable video preview if previews are disabledMorris Jobke2015-06-102-1/+2
|/
* Merge pull request #16759 from owncloud/backport-16748-stable7Morris Jobke2015-06-101-13/+21
|\ | | | | Backport stable7: port detection needs to take care of now thrown exceptions when LDAP …
| * port detection needs to take care of now thrown exceptions when LDAP server ↵Arthur Schiwon2015-06-051-13/+21
| | | | | | | | is not available
* | Check if arrayLukas Reschke2015-06-021-5/+7
|/ | | | | | The great library that we use apparently uses mixed types for everything because :see_no_evil: Fixes https://github.com/owncloud/core/issues/16679
* Fix compatibility with 5.4 againLukas Reschke2015-06-011-1/+1
| | | | Fixes https://github.com/owncloud/core/issues/16665
* Disallow semicolons in passed commandsLukas Reschke2015-06-011-0/+5
|
* Ensure that passed argument is always a stringLukas Reschke2015-06-011-1/+1
| | | | | | Some code paths called the `normalizePath` functionality with types other than a string which resulted in unexpected behaviour. Thus the function is now manually casting the type to a string and I corrected the usage in list.php as well.
* Revert custom patch that can cause problemsLukas Reschke2015-06-011-2/+8
|
* make sure to get the right list of users with access to the file, including ↵Bjoern Schiessle2015-05-282-1/+77
| | | | the owner
* Merge pull request #13742 from owncloud/fix-12190-2-stable7Thomas Müller2015-05-265-30/+164
|\ | | | | [backport #13740] backport #13740 to stable7
| * add primary group users to resultset before cachingArthur Schiwon2015-05-141-1/+2
| |
| * Fixes returns of group memberships and counting if all members have the ↵Arthur Schiwon2015-04-142-9/+77
| | | | | | | | specific groups as primary set.
| * Backport of #13740Arthur Schiwon2015-04-145-26/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inlcude AD primary group in user filter, if a group is selected. fixes #12190 fix counting of users in primary group :lipstick: adept to OC 7 and escape the search term Conflicts: apps/user_ldap/lib/connection.php
* | Merge pull request #15402 from owncloud/response-setContentLengthHeader-stable7Morris Jobke2015-05-202-2/+2
|\ \ | | | | | | [stable7] Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround.
| * | Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround.Andreas Fischer2015-04-042-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | Do not send Content-Length headers with a value larger than PHP_INT_MAX (2147483647) on Apache PHP SAPI 32-bit. PHP will eat them and send 2147483647 instead. When X-Sendfile is enabled, Apache will send a correct Content-Length header, even for files larger than 2147483647 bytes. When X-Sendfile is not enabled, ownCloud will not send a Content-Length header. This prevents progress bars from working, but allows the actual transfer to work properly.
* | Merge pull request #15077 from owncloud/fix-smb-oc-admin-stable7Morris Jobke2015-05-201-4/+10
|\ \ | | | | | | [stable7] Support constructing an SMB_OC without saved session credentials
| * | Support constructing an SMB_OC without saved session credentialsRobin McCorkell2015-03-201-4/+10
| | | | | | | | | | | | | | | Conflicts: apps/files_external/lib/smb_oc.php
* | | Merge pull request #15271 from owncloud/stable7-fix-ext-owncloudMorris Jobke2015-05-132-2/+10
|\ \ \ | | | | | | | | [stable7] Fix bugs in ownCloud external storage
| * | | Fix bugs in ownCloud external storageRobin McCorkell2015-03-272-2/+10
| | |/ | |/|
* | | Merge pull request #15863 from owncloud/public-reshare-webdav-stable7Morris Jobke2015-05-081-1/+2
|\ \ \ | | | | | | | | [stable7] Fix webdav access for public reshare
| * | | fix subfolder reshares over webdavRobin Appelman2015-04-241-2/+2
| | | |
| * | | resolve reshares in public webdavRobin Appelman2015-04-241-3/+4
| | | |
* | | | use displayname lookup route in files_external settingsJörn Friedrich Dreyer2015-04-231-31/+14
|/ / /
* | | throw exception when LDAP Connection was lostArthur Schiwon2015-04-221-0/+4
| | |
* | | fix filesystem and encryption testsJörn Friedrich Dreyer2015-04-222-11/+24
| | |
* | | throw exception if setup is incompleteMorris Jobke2015-04-221-1/+3
| | |
* | | fix_testsJörn Friedrich Dreyer2015-04-223-50/+200
| | |
* | | do not hide exception when ldap server has a hiccupJörn Friedrich Dreyer2015-04-223-18/+11
|/ /
* | always fall back to default share folderBjoern Schiessle2015-03-263-6/+20
| |
* | Merge pull request #14861 from owncloud/stable7-fix-sizepropagationwithshareMorris Jobke2015-03-262-0/+112
|\ \ | | | | | | [stable7] Fix size propagation over shared storage boundary
| * | Uglify unit test to make them work on stable7Vincent Petry2015-03-131-13/+13
| | |
| * | Add unit test for size propagation across share boundariesVincent Petry2015-03-131-0/+90
| | |
| * | Fix size propagation over shared storage boundaryVincent Petry2015-03-131-0/+22
| |/
* | Merge pull request #14889 from owncloud/backport-14849-stable7Morris Jobke2015-03-241-3/+6
|\ \ | | | | | | [stable7] support paged results against 389ds.