aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Merge pull request #7305 from owncloud/extstorage-configclassLukas Reschke2014-02-222-1/+32
|\ | | | | Added extra checks for ext storage class
| * 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 upgrade
| * | | 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
|\ \ \ \ | | | | | | | | | | No css js delivery via php
| * | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config/config.sample.php
| * | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Updated submodule to include XML processing fixes
| * | | | | | | | Updated submodule to include XML processing fixesVincent Petry2014-02-211-0/+0
| | | | | | | | |
* | | | | | | | | Merge pull request #7355 from owncloud/new-menu-svgicewind19912014-02-213-13/+34
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use SVG icons in New file menu
| * | | | | | | | | fix too much distance between text and iconJan-Christoph Borchardt2014-02-211-1/+1
| | | | | | | | | |
| * | | | | | | | | use SVG icons from icons.css for New file menuJan-Christoph Borchardt2014-02-213-13/+34
| |/ / / / / / / /
* | | | | | | | | Merge pull request #7088 from owncloud/sharing-userspathbugicewind19912014-02-212-19/+130
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix usersPath bug
| * \ \ \ \ \ \ \ \ Merge branch 'master' into sharing-userspathbugRobin Appelman2014-02-218-15/+59
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix test so that it doesn't depend on the array orderBjoern Schiessle2014-02-211-14/+25
| | | | | | | | | | |
| * | | | | | | | | | fix usersPath and add unit testsBjoern Schiessle2014-02-212-10/+110
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirsMorris Jobke2014-02-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | fix thumbnail generation for subdirectories in the conflicts dialog
| * | | | | | | | | | use directory from original instead of current dirJörn Friedrich Dreyer2014-02-211-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #7336 from owncloud/IE-wipho-viewporticewind19912014-02-211-0/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | fix viewport size on windows phone
| * | | | | | | | | | fix viewport size on windows phoneRobin Appelman2014-02-201-0/+11
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #7292 from owncloud/sharing_testsBjörn Schießle2014-02-212-7/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | fix sharing unit tests
| * | | | | | | | | | fix sharing unit testsBjoern Schiessle2014-02-212-7/+7
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #7350 from owncloud/config-gitignoreThomas Müller2014-02-211-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | ignore optional additional config files
| * | | | | | | | | ignore optional additional config filesMorris Jobke2014-02-211-0/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #7337 from owncloud/test_for_6935Björn Schießle2014-02-211-0/+34
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | add unit test for \OC\URLGenerator::getAbsoluteURL
| * | | | | | | | add unit test for \OC\URLGenerator::getAbsoluteURL to verify #6935Bjoern Schiessle2014-02-201-0/+34
| | | | | | | | |
* | | | | | | | | Merge pull request #7309 from owncloud/mobile-headerMorris Jobke2014-02-218-15/+59
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Header optimizations for mobile
| * | | | | | | | Merge branch 'master' into mobile-headerRobin Appelman2014-02-2147-267/+779
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #7347 from owncloud/patch-headers-already-sentMorris Jobke2014-02-212-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix "headers are already sent" introduced with #6519
| * \ \ \ \ \ \ \ \ Merge branch 'master' into patch-headers-already-sentRobin Appelman2014-02-211-15/+0
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #7348 from owncloud/remove-problematic-testicewind19912014-02-211-15/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | Remove unit tests which causes the filesystem tests to fail
| * | | | | | | | | Remove unit tests which causes the filesystem tests to failRobin Appelman2014-02-211-15/+0
|/ / / / / / / / /
| * | | | | | | | Remove `session_id_regenerate` from hereLukas Reschke2014-02-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Jenkins somewhat complains that there are already sent headers.
| * | | | | | | | Move session_regenerate_id to `login()`Lukas Reschke2014-02-211-0/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #7312 from owncloud/ldap_fix_add_testThomas Müller2014-02-212-3/+169
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | LDAP: fix and extend tests
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-23 20:22:39 +0000