summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | use history icon in Deleted Files template as wellJan-Christoph Borchardt2013-06-172-2/+2
| * | | | | standardize on 32px loading spinner, decrease size in CSS where neededJan-Christoph Borchardt2013-06-173-0/+7
| * | | | | use proper style for add iconJan-Christoph Borchardt2013-06-172-8/+60
| * | | | | remove unused loading spinners, just have oneJan-Christoph Borchardt2013-06-173-2/+2
| * | | | | remove unused big imagesJan-Christoph Borchardt2013-06-172-0/+0
| * | | | | use mail icon consistent with Mail app iconJan-Christoph Borchardt2013-06-172-6/+94
| * | | | | transparent background for lock iconJan-Christoph Borchardt2013-06-171-0/+0
| * | | | | use consistent icon for 'restore'/versions/history, also SVGJan-Christoph Borchardt2013-06-172-1/+1
| * | | | | differentiate delete from close iconJan-Christoph Borchardt2013-06-175-11/+63
* | | | | | Merge pull request #3946 from owncloud/fixing-3942-masterThomas Müller2013-07-084-44/+40
|\ \ \ \ \ \
| * | | | | | fixing check if public share is a folder or notThomas Müller2013-07-061-1/+1
| * | | | | | removing unused getSharedItem()Thomas Müller2013-07-061-11/+0
| * | | | | | Merge branch 'master' into fixing-3942-masterThomas Müller2013-07-0616-173/+287
| |\ \ \ \ \ \
| * | | | | | | on reshares we now recursively move to the root of all reshares - therefore s...Thomas Müller2013-07-053-31/+39
| * | | | | | | fixing Notice: Undefined index: isPublicThomas Müller2013-07-051-0/+1
| * | | | | | | handle anonymous upload to reshared folderThomas Müller2013-07-051-0/+5
* | | | | | | | Merge https://github.com/owncloud/core/pull/3827Björn Schießle2013-07-084-17/+27
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-08550-1138/+1184
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-07544-1227/+1335
| |_|_|_|/ / / |/| | | | | |