summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #16863 from owncloud/stable7-backport-16840Morris Jobke2015-06-102-1/+2
|\ \ \ | |/ / |/| | [stable7] Disable video preview if previews are disabled
| * | 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
* | | Merge pull request #16682 from owncloud/stable7-check-for-arryMorris Jobke2015-06-101-5/+7
|\ \ \ | | | | | | | | Check if array
| * | | 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
* | | | Merge pull request #16707 from owncloud/stable7-fix-ie8-ie9Morris Jobke2015-06-101-0/+1
|\ \ \ \ | | | | | | | | | | [stable7] Add min-height to login page for IE8 and IE9
| * | | | Add min-height to login page for IE8 and IE9Morris Jobke2015-06-031-0/+1
| |/ / /
* | | | Merge pull request #16773 from owncloud/fix-16582blizzz2015-06-091-1/+1
|\ \ \ \ | |_|/ / |/| | | return name instead of false, as it is on oc8 and master, so groups a…
| * | | return name instead of false, as it is on oc8 and master, so groups are ↵Arthur Schiwon2015-06-051-1/+1
|/ / / | | | | | | | | | displayed in files_external
* / / 7.0.6v7.0.6Frank Karlitschek2015-06-031-2/+2
|/ /
* | 7.0.6RC2v7.0.6RC2Frank Karlitschek2015-06-011-2/+2
| |
* | Merge pull request #16666 from owncloud/fix-codeThomas Müller2015-06-011-1/+1
|\ \ | | | | | | Fix compatibility with 5.3 again
| * | 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-012-1/+10
| | | | | | | | | | | | 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.
* | Clean application identifier before processingLukas Reschke2015-06-011-0/+2
| |
* | Revert custom patch that can cause problemsLukas Reschke2015-06-011-2/+8
| |
* | Merge pull request #16635 from owncloud/stable7-fix-themes-readmeMorris Jobke2015-05-301-1/+0
|\ \ | | | | | | [stable7] Fix themes README
| * | Fix themes READMEMorris Jobke2015-05-301-1/+0
|/ / | | | | Fixes #16617
* | 7.0.6 RC1v7.0.6RC1Frank Karlitschek2015-05-291-2/+2
| |
* | Merge pull request #16608 from owncloud/fix_14588Vincent Petry2015-05-282-1/+77
|\ \ | | | | | | [stable7] make sure to get the right list of users with access to the file when deleting a shared file
| * | 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-205-4/+33
|\ \ | | | | | | [stable7] Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround.
| * | Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround.Andreas Fischer2015-04-045-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #16291 from RealRancor/asset_pipe_noteThomas Müller2015-05-131-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Add note for asset pipeline and third-party apps on stable7
| * | | | | Add note for asset pipeline and third-party apps on stable7RealRancor2015-05-121-0/+3
|/ / / / /
* | | | | 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
| | | | | |
* | | | | | Merge pull request #16114 from owncloud/stable7-backport-15510-and-15465Lukas Reschke2015-05-085-16/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | [stable7] block cron.php and OCS API when in single user mode or maintenance mode
| * | | | | | Fix singe user mode on public.php - take twoThomas Müller2015-05-062-2/+6
| | | | | | |
| * | | | | | Fix single user check in case no user is logged inThomas Müller2015-05-061-13/+19
| | | | | | |
| * | | | | | block ocs in single user modeRobin Appelman2015-05-061-1/+3
| | | | | | |
| * | | | | | block webdav in single user modeRobin Appelman2015-05-061-0/+3
| | | | | | |
| * | | | | | block cron when in single user modeRobin Appelman2015-05-061-0/+5
| | | | | | |
| * | | | | | Disable OCS api when in maintenance modeJoas Schilling2015-05-061-1/+1
| |/ / / / /
* | | | | | Merge pull request #15833 from owncloud/backport-files-external-fixesLukas Reschke2015-05-053-31/+49
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Backport files external fixes
| * | | | | use displayname lookup route in files_external settingsJörn Friedrich Dreyer2015-04-231-31/+14
| | | | | |
| * | | | | add lookup route for displaynamesJörn Friedrich Dreyer2015-04-232-0/+35
|/ / / / /
* | | | | Merge pull request #15332 from owncloud/dont_hide_exceptionsMorris Jobke2015-04-2216-126/+343
|\ \ \ \ \ | |_|_|_|/ |/| | | | do not hide exception when ldap server has a hiccup
| * | | | throw exception when LDAP Connection was lostArthur Schiwon2015-04-221-0/+4
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 03:06:30 +0000