summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | combineFilterWithAnd recently moved to Accessroot2013-12-081-3/+3
| * | | | | | | | | | | add support for nested groupsroot2013-12-063-10/+73
* | | | | | | | | | | | Merge pull request #7374 from owncloud/enc_dont_overwrite_keysBjörn Schießle2014-02-254-4/+140
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add test case if a file gets moved out from the shared folderBjoern Schiessle2014-02-242-0/+125
| * | | | | | | | | | | | don't overwrite keys if rename was done by a stream copyBjoern Schiessle2014-02-242-4/+15
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Fix case where port is missingVincent Petry2014-02-251-1/+1
* | | | | | | | | | | | Merge pull request #7285 from owncloud/mimeicons-svgMorris Jobke2014-02-246-31/+49
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rename url parameterRobin Appelman2014-02-242-2/+2
| * | | | | | | | | | | | Add url parameter to control whether previews should return 404 when the mime...Robin Appelman2014-02-212-1/+3
| * | | | | | | | | | | | Merge branch 'master' into mimeicons-svgRobin Appelman2014-02-2120-60/+272
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Make unit tests expect the svg iconsRobin Appelman2014-02-201-2/+6
| * | | | | | | | | | | | | Merge branch 'master' into mimeicons-svgRobin Appelman2014-02-20231-3412/+2134
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Fix svg icons for public shares and external/shared filesRobin Appelman2014-02-192-4/+5
| * | | | | | | | | | | | | Show svg mime icons when no preview is availableRobin Appelman2014-02-194-26/+37
* | | | | | | | | | | | | | Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1Morris Jobke2014-02-244-3/+79
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Added oc_defaults stub in specHelper.jsVincent Petry2014-02-241-0/+1
| * | | | | | | | | | | | | | Merge branch 'master' into GuillaumeAmat-patch-1Robin Appelman2014-02-2144-187/+540
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | code style: else on same lineJan-Christoph Borchardt2014-02-211-2/+1
| * | | | | | | | | | | | | | fix intendationMorris Jobke2014-02-201-3/+3
| * | | | | | | | | | | | | | Fixed trashbin titleVincent Petry2014-02-202-22/+46
| * | | | | | | | | | | | | | Fixed title formatVincent Petry2014-02-201-1/+8
| * | | | | | | | | | | | | | Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-pa...Vincent Petry2014-02-202-3/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Uses OC.basename instead of custom codeGuillaume AMAT2014-02-191-2/+2
| | * | | | | | | | | | | | | | Gets the page title from oc_defaults in Files appGuillaume AMAT2014-02-131-1/+1
| | * | | | | | | | | | | | | | Adds OC_Defaults values in javascript configGuillaume AMAT2014-02-131-0/+17
| | * | | | | | | | | | | | | | Update page title when navigating through directoriesGuillaume AMAT2014-02-121-3/+31
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #7344 from owncloud/add-js-config-varsicewind19912014-02-241-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into add-js-config-varsRobin Appelman2014-02-2117-41/+282
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Allow apps to add/modify config js output via hook.ringmaster2014-02-201-3/+6
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #7305 from owncloud/extstorage-configclassLukas Reschke2014-02-222-1/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into extstorage-configclassRobin Appelman2014-02-21236-3344/+2173
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Added extra checks for ext storage classVincent Petry2014-02-202-1/+32
* | | | | | | | | | | | | | | Merge pull request #7259 from owncloud/overwritehost-alwaysLukas Reschke2014-02-224-15/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add overwritehost config on setup and upgradeLukas Reschke2014-02-214-15/+50
* | | | | | | | | | | | | | | | Merge pull request #7310 from owncloud/no-css-js-delivery-via-phpMorris Jobke2014-02-2114-234/+95
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | update 3rdparty submodule to current masterMorris Jobke2014-02-211-0/+0
| * | | | | | | | | | | | | | | | Merge branch 'master' into no-css-js-delivery-via-phpThomas Müller2014-02-2112-31/+94
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into no-css-js-delivery-via-phpThomas Müller2014-02-2133-150/+428
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | kill $coreStyles and $coreScriptsThomas Müller2014-02-203-17/+0
| * | | | | | | | | | | | | | | | | revert wrong change to .htaccessThomas Müller2014-02-201-0/+1
| * | | | | | | | | | | | | | | | | remove unused functions - have been introduced with the old minimizer approachThomas Müller2014-02-201-27/+0
| * | | | | | | | | | | | | | | | | IndentationLukas Reschke2014-02-201-2/+2
| * | | | | | | | | | | | | | | | | Merge branch 'master' into no-css-js-delivery-via-phpThomas Müller2014-02-20304-3344/+2174
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | integrate assetic for asset pipeline-ingThomas Müller2014-02-202-25/+91
| * | | | | | | | | | | | | | | | | | enable static delivery of css filesThomas Müller2014-02-201-1/+1
| * | | | | | | | | | | | | | | | | | reference 3rdparty branch add-asseticThomas Müller2014-02-201-0/+0
| * | | | | | | | | | | | | | | | | | kill references to core.js and core.cssThomas Müller2014-02-202-17/+0
| * | | | | | | | | | | | | | | | | | kill old minimizer codeThomas Müller2014-02-206-149/+4
| * | | | | | | | | | | | | | | | | | fixing js syntax errorThomas Müller2014-02-201-3/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #7358 from owncloud/xmlfix-3rdpartyVincent Petry2014-02-211-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \