summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into GuillaumeAmat-patch-1Robin Appelman2014-02-2144-187/+540
|\
| * Merge pull request #7336 from owncloud/IE-wipho-viewporticewind19912014-02-211-0/+11
| |\
| | * 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 testsBjoern Schiessle2014-02-212-7/+7
| * | | Merge pull request #7350 from owncloud/config-gitignoreThomas Müller2014-02-211-0/+1
| |\ \ \
| | * | | 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 to verify #6935Bjoern Schiessle2014-02-201-0/+34
| * | | | | Merge pull request #7309 from owncloud/mobile-headerMorris Jobke2014-02-218-15/+59
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | 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
| |\ \ \ \ \
| | * \ \ \ \ 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 failRobin Appelman2014-02-211-15/+0
| |/ / / / /
| | * | | | Remove `session_id_regenerate` from hereLukas Reschke2014-02-211-1/+0
| | * | | | 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 testsArthur Schiwon2014-02-202-3/+169
| * | | | | Merge pull request #7291 from owncloud/adminess-raghuLukas Reschke2014-02-205-26/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix typoLukas Reschke2014-02-201-1/+1
| | * | | | Variable value is expected and not an echoed outputLukas Reschke2014-02-201-1/+1
| | * | | | Move oc_isadmin to the config JS scriptLukas Reschke2014-02-203-2/+2
| | * | | | Move isadmin to template and rename it to oc_isadminLukas Reschke2014-02-196-27/+4
| * | | | | Merge pull request #7332 from owncloud/IE10-viewportMorris Jobke2014-02-201-0/+5
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | fix IE10 viewport sizeingRobin Appelman2014-02-201-0/+5
| |/ / / /
| * | | | Merge pull request #6962 from owncloud/quota-space-rootThomas Müller2014-02-204-6/+31
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into quota-space-rootRobin Appelman2014-02-1020-35/+68
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into quota-space-rootRobin Appelman2014-02-0798-733/+2170
| | |\ \ \ \ \
| | * | | | | | Don't create new thumbnails on the write hookRobin Appelman2014-02-041-1/+1
| | * | | | | | Add unit test for quote wrapper size rootRobin Appelman2014-02-041-3/+22
| | * | | | | | Actually rename the variableRobin Appelman2014-01-271-2/+2
| | * | | | | | Fix phpdocRobin Appelman2014-01-271-1/+1
| | * | | | | | Allow passing a root folder to get the used space from in the quota wrapperRobin Appelman2014-01-272-2/+8
| * | | | | | | Merge pull request #7056 from owncloud/users-scrollperformanceJan-Christoph Borchardt2014-02-203-25/+76
| |\ \ \ \ \ \ \
| | * | | | | | | Added loading spinner to users list on scrollVincent Petry2014-02-181-0/+4
| | * | | | | | | Improve users list scrolling performanceVincent Petry2014-02-173-25/+72
| * | | | | | | | Merge pull request #6808 from globalpointfamily/remove_ie9_navagation_width_fixJan-Christoph Borchardt2014-02-201-5/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | remove fix for IE9 nav bar widthKonstantin.Popov2014-01-171-5/+0
| * | | | | | | | | Merge pull request #7290 from owncloud/issue/5463icewind19912014-02-201-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Correctly redirect to settings page when not selecting cert file for uploadJoas Schilling2014-02-191-1/+1
| * | | | | | | | | | Merge pull request #7205 from owncloud/fix_7153blizzz2014-02-201-0/+6
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | LDAP: prevent other configuration from being deleted when deleting the first ...Arthur Schiwon2014-02-141-0/+6
| * | | | | | | | | | | Merge pull request #7319 from owncloud/remote-unneeded-ifMorris Jobke2014-02-201-5/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Remove no longer needed if statementRobin Appelman2014-02-201-5/+1
| * | | | | | | | | | | | Merge pull request #6999 from kofemann/mount-configLukas Reschke2014-02-203-9/+10
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | mount: make location of mount.json configurableTigran Mkrtchyan2014-01-293-9/+10
| * | | | | | | | | | | | | Merge pull request #6935 from owncloud/fix_urlGeneratorBjörn Schießle2014-02-201-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Test if $url is already prefixed by '/'Thomas Tanghus2014-02-071-1/+2
| | * | | | | | | | | | | | | Add missing slash in URLGenerator::getAbsoluteURL(). Refs. #6840Thomas Tanghus2014-01-241-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-11 02:58:48 +0000