summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Disable JS plugin for sharing in public modeVincent Petry2015-01-262-2/+26
* Merge pull request #13490 from owncloud/fix_reshare_s2s_shareVincent Petry2015-01-2610-68/+98
|\
| * certificate manager should always use a \OC\Files\View otherwise we will get ...Bjoern Schiessle2015-01-264-19/+48
| * certificate manager only needs the user-id, no need to pass on the complete u...Bjoern Schiessle2015-01-266-20/+22
| * use uid provided by setupfs hook to mount server2server shares, otherwise mou...Bjoern Schiessle2015-01-265-35/+34
* | Merge pull request #13677 from owncloud/s2s-doubleslashrequestVincent Petry2015-01-261-1/+1
|\ \ | |/ |/|
| * Prevent double slash in shareinfo request URLVincent Petry2015-01-261-1/+1
|/
* Merge pull request #13660 from owncloud/remove-duplicate-service-definitionThomas Müller2015-01-261-12/+0
|\
| * Remove duplicated definition of APIControllerJoas Schilling2015-01-261-12/+0
* | Merge pull request #13621 from owncloud/system-config-multisetThomas Müller2015-01-2615-137/+258
|\ \ | |/ |/|
| * naming fixes while reviewingThomas Müller2015-01-263-19/+21
| * Use setConfigs() instead of calling setConfig() multiple timesJoas Schilling2015-01-239-99/+105
| * Add a method to set/unset multiple config values in one callJoas Schilling2015-01-236-22/+135
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-262-0/+2
* | 8.0 beta 2v8.0.0beta2Frank Karlitschek2015-01-261-2/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2528-14/+80
* | [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 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 HHVMLukas Reschke2015-01-231-0/+14
* | | Merge pull request #13463 from owncloud/share-getitemsharedwithuser-emptygroupLukas Reschke2015-01-232-21/+48
|\ \ \ | |/ / |/| |
| * | Do not retrieve shares through group if user has no groupVincent Petry2015-01-232-21/+48
|/ /
* | Merge pull request #13479 from owncloud/issue/13475-favorites-and-unavailable...Lukas Reschke2015-01-232-3/+19
|\ \
| * | Ignore favorites that are not available when creating the favorites listJoas Schilling2015-01-232-3/+19
| |/
* | Merge pull request #13590 from owncloud/sabredav-1.8.12Morris Jobke2015-01-231-0/+0
|\ \ | |/ |/|
| * 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 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
| |/
* | Merge pull request #13314 from owncloud/login-hook-logoutMorris Jobke2015-01-225-12/+41
|\ \
| * | 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 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_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 addressMorris Jobke2015-01-222-12/+27
| | |_|/ | |/| |
* | | | Merge pull request #13600 from owncloud/server-warningThomas Müller2015-01-221-39/+36
|\ \ \ \ | |/ / / |/| | |
| * | | 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 codeVincent Petry2015-01-223-9/+68
* | | | | [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 keysRobin Appelman2015-01-201-12/+9
| | |/ / / | |/| | |
* | | | | Merge pull request #13568 from owncloud/s2s_delete_shares_jenkinsMorris Jobke2015-01-224-0/+144
|\ \ \ \ \