summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4015 from owncloud/fixing-4005-masterJörn Friedrich Dreyer2013-07-113-6/+14
|\
| * - eventsource.php: in case of potential CSRF attack we send an error message ...Thomas Müller2013-07-113-6/+14
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-11558-1386/+1760
|/
* Merge pull request #3978 from owncloud/forwarding-emittericewind19912013-07-103-1/+125
|\
| * forward previously registerd hooksRobin Appelman2013-07-083-1/+21
| * add forwarding emitter for agregating multiple emittersRobin Appelman2013-07-082-0/+104
* | 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 #3990 from owncloud/size-mbJan-Christoph Borchardt2013-07-101-1/+1
|\ \ \
| * | | add MB indicator to size heading, fix #3987Jan-Christoph Borchardt2013-07-101-1/+1
* | | | Merge pull request #4002 from owncloud/use_OC_in_settings_jsMorris Jobke2013-07-101-1/+1
|\ \ \ \
| * | | | Use OC instead of oc to show alert at an error.kondou2013-07-101-1/+1
* | | | | Merge pull request #4003 from owncloud/use_close_png_instead_of_delete_png_fo...Morris Jobke2013-07-102-2/+2
|\ \ \ \ \
| * | | | | Close.png instead of delete.png for close dialogskondou2013-07-102-2/+2
| |/ / / /
* | | | | LDAP: even better check for emptiness, fixes #3815Arthur Schiwon2013-07-101-8/+19
* | | | | 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-10540-2546/+2571
|/ / /
* | | 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
* | | | Merge pull request #3943 from owncloud/encode_uri_componentVicDeo2013-07-098-16/+48
|\ \ \ \ | |_|/ / |/| | |
| * | | Add unit testVictor Dubiniuk2013-07-091-0/+6
| * | | Encode current trashbin directoryVictor Dubiniuk2013-07-091-3/+6
| * | | Migrate to encodePathVictor Dubiniuk2013-07-094-12/+6
| * | | Implement encodePathVictor Dubiniuk2013-07-092-1/+30
|/ / /
* | | Merge pull request #3980 from owncloud/try-permissions-hook-againJörn Friedrich Dreyer2013-07-091-9/+11
|\ \ \
| * | | Only emit permissions hook for files and and include pathMichael Gapczynski2013-07-081-9/+11
* | | | Merge pull request #3920 from owncloud/Fixing_search_ie8Jörn Friedrich Dreyer2013-07-092-2/+10
|\ \ \ \
| * | | | Fallback to border instead of box-shadowVictor Dubiniuk2013-07-021-0/+4
| * | | | Fix lazy styles loading in IE8Victor Dubiniuk2013-07-021-2/+6
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-09604-2671/+2886
| |/ / / |/| | |
* | | | Merge pull request #3977 from owncloud/enable_oracle_in_autotestsThomas Müller2013-07-082-3/+2
|\ \ \ \
| * | | | requires fixes in 3rdparty mdb2Jörn Friedrich Dreyer2013-07-081-0/+0
| * | | | enable oracle testing by defaultJörn Friedrich Dreyer2013-07-081-3/+2
* | | | | Merge pull request #3963 from owncloud/update-logic-spliticewind19912013-07-083-147/+161
|\ \ \ \ \
| * | | | | 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-063-146/+160
* | | | | | Merge pull request #3979 from owncloud/permissions-hookJörn Friedrich Dreyer2013-07-081-0/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add update permissions hook to sharingMichael Gapczynski2013-07-081-0/+9
|/ / / / /
* | | | | Merge pull request #3954 from owncloud/update_insertifnotexist_and_testThomas Müller2013-07-082-20/+17
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | update commentJörn Friedrich Dreyer2013-07-051-1/+1
| * | | | fix insertIfNotExist return value, update doc and corresponding testJörn Friedrich Dreyer2013-07-052-19/+16
* | | | | Merge pull request #3757 from owncloud/icon-cleanupJan-Christoph Borchardt2013-07-0818-29/+27
|\ \ \ \ \
| * | | | | change delete from entry forbidden sign to proper iconJan-Christoph Borchardt2013-07-052-3/+10
| * | | | | Optimize pictures with optipng and scourkondou2013-06-215-217/+9