summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-2480-6/+190
|
* Merge pull request #13637 from owncloud/s2s_notification_new_defaultsBjörn Schießle2015-01-232-3/+75
|\ | | | | by default send mail for new server-to-server share
| * by default send mail for new server-to-server shareBjoern Schiessle2015-01-232-3/+75
|/
* Merge pull request #13626 from owncloud/check-for-hhvmClark Tomlinson2015-01-231-0/+14
|\ | | | | Don't check for `always_populate_raw_post_data` on HHVM
| * Don't check for `always_populate_raw_post_data` on HHVMLukas Reschke2015-01-231-0/+14
| | | | | | | | | | | | HHVM seems to have problems with this at the moment (even setting those values in the php.ini of HHVM doesn't have helped much) and thus the unit test execution failed. So it's better if we disable this check for now for HHVM.
* | Merge pull request #13463 from owncloud/share-getitemsharedwithuser-emptygroupLukas Reschke2015-01-232-21/+48
|\ \ | |/ |/| Do not retrieve shares through group if user has no group
| * Do not retrieve shares through group if user has no groupVincent Petry2015-01-232-21/+48
|/
* Merge pull request #13479 from ↵Lukas Reschke2015-01-232-3/+19
|\ | | | | | | | | owncloud/issue/13475-favorites-and-unavailable-external-storages Ignore favorites that are not available when creating the favorites list
| * Ignore favorites that are not available when creating the favorites listJoas Schilling2015-01-232-3/+19
| | | | | | | | Also correctly return the exception for all cases when adding/removing favos
* | Merge pull request #13590 from owncloud/sabredav-1.8.12Morris Jobke2015-01-231-0/+0
|\ \ | |/ |/| Update SabreDAV to 1.8.12
| * Update SabreDAV to 1.8.12Thomas Müller2015-01-231-0/+0
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2322-6/+58
| |
* | Merge pull request #13593 from owncloud/add-check-for-raw-post-dataMorris Jobke2015-01-223-2/+19
|\ \ | | | | | | Add check for `HTTP_RAW_POST_DATA` setting for >= 5.6
| * | add always_populate_raw_post_data to .user.iniMorris Jobke2015-01-221-0/+1
| | |
| * | translate error messagesMorris Jobke2015-01-221-4/+4
| | |
| * | Add check for `HTTP_RAW_POST_DATA` setting for >= 5.6Lukas Reschke2015-01-222-0/+16
| |/ | | | | | | | | | | PHP 5.6 otherwise throws notices for perfectly valid code which results in broken endpoints. Fixes https://github.com/owncloud/core/issues/13592
* | Merge pull request #13314 from owncloud/login-hook-logoutMorris Jobke2015-01-225-12/+41
|\ \ | | | | | | Return false if the login is canceled in a hook
| * | Throw an exception when login is canceled by an appRobin Appelman2015-01-223-11/+33
| | |
| * | Allow custom error messages for the login pageRobin Appelman2015-01-222-1/+8
| | |
| * | Return false if the login is canceled in a hookRobin Appelman2015-01-131-1/+1
| | |
* | | Merge pull request #13449 from owncloud/image_preview_limitThomas Müller2015-01-222-0/+19
|\ \ \ | | | | | | | | add config-option for an image's maximum filesize when generating previews
| * | | add config-option for an image's maximum filesize when generating previewsGeorg Ehrke2015-01-222-0/+19
| | | |
* | | | Merge pull request #13614 from owncloud/oc_image_log_fixThomas Müller2015-01-221-1/+0
|\ \ \ \ | | | | | | | | | | remove insane debug-log from OC_Image
| * | | | remove insane debug-log from OC_ImageGeorg Ehrke2015-01-221-1/+0
|/ / / /
* | | | Merge pull request #13598 from owncloud/fix-undefined-offsetThomas Müller2015-01-222-12/+27
|\ \ \ \ | | | | | | | | | | Fix undefined offset 1 for wrong user mail address
| * | | | Fix undefined offset 1 for wrong user mail addressMorris Jobke2015-01-222-12/+27
| | |_|/ | |/| | | | | | | | | | * fixes Undefined offset: 1 at lib/private/mail.php#143
* | | | Merge pull request #13600 from owncloud/server-warningThomas Müller2015-01-221-39/+36
|\ \ \ \ | |/ / / |/| | | Get rid of log warning when using servercontainer
| * | | get rid of log warning when using servercontainerBernhard Posselt2015-01-221-39/+36
| | | |
* | | | Merge pull request #13509 from owncloud/share-deletechildrenwhenunsharefromgroupMorris Jobke2015-01-223-9/+68
|\ \ \ \ | | | | | | | | | | Fix reshare permission change to not impair other deletion code
| * | | | Fix reshare permission change to not impair other deletion codeVincent Petry2015-01-223-9/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent change that prevents reshare permission changes to delete group share children had the side-effect of also preventing group share children deletion when it needed to be done. This fix adds an extra flag to isolate the "reshare permission change" deletion case and keep the other ones as they were before, not only to fix the regression but also fix other potential regressions in code that uses this method. Also updated the comment because now Helper::delete() is no longer limited to reshares but also applies to group share children.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-22136-236/+186
| | | | |
* | | | | Merge pull request #13517 from owncloud/keymanager-storageMorris Jobke2015-01-221-12/+9
|\ \ \ \ \ | | | | | | | | | | | | Bypass the view when storing encryption keys
| * | | | | Bypass the view when storing encryption keysRobin Appelman2015-01-201-12/+9
| | |/ / / | |/| | |
* | | | | Merge pull request #13568 from owncloud/s2s_delete_shares_jenkinsMorris Jobke2015-01-224-0/+144
|\ \ \ \ \ | | | | | | | | | | | | [ignore] delete all server-to-server shares if a user gets deleted
| * | | | | delete all server-to-server shares if a user gets deletedBjoern Schiessle2015-01-214-0/+144
| | | | | |
* | | | | | Merge pull request #13581 from owncloud/make-naming-consistentMorris Jobke2015-01-222-2/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make naming of encryption app consistent
| * | | | | | Make naming of encryption app consistentLukas Reschke2015-01-212-2/+10
|/ / / / / / | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/13580
* | | | | | Merge pull request #13552 from owncloud/request-uri-double-slashThomas Müller2015-01-212-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove duplicated slashes from the requested url
| * | | | | | Add unit testRobin Appelman2015-01-211-0/+1
| | | | | | |
| * | | | | | Remove duplicated slashes from the requested urlRobin Appelman2015-01-211-0/+2
| | | | | | |
* | | | | | | Merge pull request #13519 from Sugaroverdose/fix_#13500Thomas Müller2015-01-211-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Do not clear fields until request return success in users admin page on user creation
| * | | | | | | do not clear fields until request return successSugaroverdose2015-01-201-1/+2
| | | | | | | |
* | | | | | | | Merge pull request #13559 from owncloud/increase-log-table-marginMorris Jobke2015-01-211-1/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | add margin to log table - fixes #13558
| * | | | | | | add margin to log table - fixes #13558Morris Jobke2015-01-211-1/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #13432 from owncloud/animate_gifs_public_sharingThomas Müller2015-01-215-3/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | show animated gifs on public sharing page
| * | | | | | | show animated gifs on public sharing pageGeorg Ehrke2015-01-195-3/+30
| | | | | | | |
* | | | | | | | Merge pull request #13563 from owncloud/proper-titleThomas Müller2015-01-211-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | use title instead of name
| * | | | | | | | use title instead of nameMorris Jobke2015-01-211-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #13540 from owncloud/s2s-fixpasswordfromdialogThomas Müller2015-01-213-59/+204
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | External share dialog must properly read entered password
| * | | | | | | | Add unit test for external share JS dialogVincent Petry2015-01-213-58/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved external share JS code into a small plugin to make it testable. Added unit test for the external share dialog logic + ajax calls.
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 21:12:07 +0000