summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3978 from owncloud/forwarding-emittericewind19912013-07-102-1/+51
|\
| * forward previously registerd hooksRobin Appelman2013-07-082-1/+9
| * add forwarding emitter for agregating multiple emittersRobin Appelman2013-07-081-0/+42
* | Merge pull request #3985 from owncloud/cookie-past2Morris Jobke2013-07-101-3/+3
|\ \
| * | Set path in cookie.Thomas Tanghus2013-07-091-3/+3
| * | apply @LukasReschke's cookie changes, hopefully finally fix #854Jan-Christoph Borchardt2013-07-091-3/+3
* | | Merge pull request #3994 from owncloud/fix_oracle_setupJörn Friedrich Dreyer2013-07-101-4/+4
|\ \ \
| * | | General fixesVictor Dubiniuk2013-07-101-4/+4
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-101-0/+2
|/ / /
* | | Merge pull request #3787 from mvn23/patch-1mvn232013-07-091-0/+16
|\ \ \
| * | | Reviewed code for X-Sendfile2mvn232013-06-201-12/+12
| * | | Revert most changes for testingmvn232013-06-201-11/+13
| * | | Update files.phpmvn232013-06-191-2/+4
| * | | Implement X-Sendfile2 for resume support in LigHTTPdmvn232013-06-191-1/+13
* | | | Implement encodePathVictor Dubiniuk2013-07-092-1/+30
| |/ / |/| |
* | | Only emit permissions hook for files and and include pathMichael Gapczynski2013-07-081-9/+11
* | | Merge pull request #3963 from owncloud/update-logic-spliticewind19912013-07-082-40/+133
|\ \ \
| * | | fix typoRobin Appelman2013-07-081-2/+2
| * | | Updater: pass update url as argument to update checkRobin Appelman2013-07-062-6/+6
| * | | split upgrade logic from ajax fileRobin Appelman2013-07-062-39/+132
* | | | Add update permissions hook to sharingMichael Gapczynski2013-07-081-0/+9
* | | | Merge pull request #3954 from owncloud/update_insertifnotexist_and_testThomas Müller2013-07-081-6/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | update commentJörn Friedrich Dreyer2013-07-051-1/+1
| * | | fix insertIfNotExist return value, update doc and corresponding testJörn Friedrich Dreyer2013-07-051-5/+2
* | | | Merge pull request #3946 from owncloud/fixing-3942-masterThomas Müller2013-07-081-11/+23
|\ \ \ \
| * | | | removing unused getSharedItem()Thomas Müller2013-07-061-11/+0
| * | | | Merge branch 'master' into fixing-3942-masterThomas Müller2013-07-062-1/+15
| |\ \ \ \
| * | | | | on reshares we now recursively move to the root of all reshares - therefore s...Thomas Müller2013-07-051-0/+23
* | | | | | Merge https://github.com/owncloud/core/pull/3827Björn Schießle2013-07-083-16/+26
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-081-0/+18
| |_|_|/ / |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-0662-3/+69
| |/ / / |/| | |
* | | | Merge pull request #3951 from owncloud/fixing-3936-masterThomas Müller2013-07-051-1/+12
|\ \ \ \
| * | | | proper fix for getting the shared item if no user is logged inThomas Müller2013-07-051-1/+12
| |/ / /
* | | | Merge pull request #3957 from owncloud/config-glob-failThomas Müller2013-07-051-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | OC_Config: handle failure of glob('*.config.php')Robin Appelman2013-07-051-0/+3
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-051-1/+5
|/ / /
* | | eddition string should be empty by defaultBjörn Schießle2013-07-041-1/+1
* | | add public apiBjörn Schießle2013-07-041-0/+108
* | | move to non-static OC_DefaultsBjörn Schießle2013-07-043-58/+61
* | | Add init funtion to OC_Defaults to be able to wrap translatable stringsBjörn Schießle2013-07-042-9/+26
* | | Merge pull request #3888 from owncloud/ocs_api_fixesBart Visscher2013-07-031-0/+2
|\ \ \
| * | | Allow setting defaults and requirements for the api routeBart Visscher2013-06-281-0/+2
* | | | Suppress warning in setup if config doesn't existkondou2013-07-031-1/+1
* | | | don't run hooks for .part filesBjörn Schießle2013-07-031-1/+1
* | | | if a part file gets renamed to a real file, that this was the second step of ...Björn Schießle2013-07-031-2/+20
* | | | Merge pull request #3870 from owncloud/reset_migration_statusBjörn Schießle2013-07-021-0/+1
|\ \ \ \
| * | | | introduce pre-disable-app hook and use it for the encryption app to reset mig...Björn Schießle2013-06-271-0/+1
| |/ / /
* | | | Merge pull request #3748 from owncloud/fixing-3740-masterThomas Müller2013-07-011-8/+14
|\ \ \ \
| * | | | use $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not setThomas Müller2013-07-011-2/+8
| * | | | in case $_SERVER['HTTP_HOST']) is not set let's return localhost - better tha...Thomas Mueller2013-06-171-7/+7