summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-21295-605/+753
* Merge pull request #3796 from owncloud/gracefully_handle_teardown_in_scanner_...Thomas Müller2013-06-201-4/+6
|\
| * skip teardown if cache has not been set upJörn Friedrich Dreyer2013-06-201-4/+6
* | Merge pull request #3792 from owncloud/scanfolder-removeThomas Müller2013-06-202-0/+35
|\ \
| * | adding unit test for folder remove: testRemovedFolder()Thomas Mueller2013-06-201-0/+11
| * | Merge branch 'rescan-all' into scanfolder-removeThomas Mueller2013-06-202-15/+45
| |\ \
| * | | remove deleted files when re-scanning a folderRobin Appelman2013-06-202-0/+24
* | | | Merge pull request #3779 from shkdee/patch-1blizzz2013-06-201-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update user.phpshkdee2013-06-181-1/+1
* | | | Merge pull request #3788 from owncloud/more_error_messagesBjörn Schießle2013-06-202-26/+28
|\ \ \ \
| * | | | always have a defined return valueBjörn Schießle2013-06-191-4/+4
| * | | | some more error messagesBjörn Schießle2013-06-191-5/+3
| * | | | add some more error messages, in case something went wrongBjörn Schießle2013-06-192-24/+28
* | | | | Merge pull request #3784 from owncloud/rescan-allThomas Müller2013-06-202-15/+45
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | use json to encode user listRobin Appelman2013-06-192-2/+2
| * | | | allow scanning files for multiple usersRobin Appelman2013-06-192-15/+45
* | | | | add missing backticksJörn Friedrich Dreyer2013-06-201-1/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-20580-2126/+2500
| |_|_|/ |/| | |
* | | | Merge pull request #3783 from owncloud/improved_wordingMichael Gapczynski2013-06-191-1/+1
|\ \ \ \
| * | | | fixed enghlish sentence, thanks to @MTGapBjörn Schießle2013-06-191-1/+1
| | |/ / | |/| |
* | | | Merge pull request #3764 from owncloud/scanfolder-existingicewind19912013-06-194-36/+70
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | fix updaters test casesRobin Appelman2013-06-191-2/+1
| * | add tests for reusing existing data in scannerRobin Appelman2013-06-172-5/+21
| * | reuse etag when doing a forced rescanRobin Appelman2013-06-141-1/+1
| * | scanner: give more percision about what data is reused during scanningRobin Appelman2013-06-141-17/+29
| * | split of scanning the childs of a folderRobin Appelman2013-06-141-17/+24
* | | also use the default theme if the theme is set to an empty string in the con...Björn Schießle2013-06-191-2/+2
* | | fix lost password page, don't show checkbox is encryption is not enabledBjörn Schießle2013-06-192-6/+6
* | | Merge pull request #3661 from owncloud/fixing-windows-server-masterJörn Friedrich Dreyer2013-06-194-6/+137
|\ \ \
| * | | dirname('/test.txt') returns '\' on windows whereas on linux we get back '.'Thomas Mueller2013-06-141-1/+1
| * | | restore Updater functionality on non-Windows platformsThomas Mueller2013-06-131-4/+4
| * | | Add tests for the updater with mount pointsMichael Gapczynski2013-06-121-3/+125
| * | | [Fixing unit tests in Windows]Thomas Mueller2013-06-101-0/+6
| * | | [Fixing Updater Unit Tests on Windows]Thomas Mueller2013-06-101-3/+3
| * | | [Fixing Updater Unit Tests on Windows]Thomas Mueller2013-06-101-1/+4
| * | | Let's just use '/' as we do almost everywhere - this change fixes two failing...Thomas Mueller2013-06-101-2/+2
* | | | Merge pull request #3773 from owncloud/port_3596Thomas Müller2013-06-191-1/+1
|\ \ \ \
| * | | | Users page: username instead of login name as col header to avoid confusion w...Arthur Schiwon2013-06-181-1/+1
* | | | | Merge pull request #3765 from owncloud/hide-logo-claimFrank Karlitschek2013-06-182-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | hide the logo claim in case the theme is not loadedJan-Christoph Borchardt2013-06-172-2/+2
* | | | | Merge pull request #3774 from owncloud/fix_sql_in_vcategoriesThomas Müller2013-06-181-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | remove dangling AND in SQL statementJörn Friedrich Dreyer2013-06-181-1/+1
|/ / / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2013-06-18542-1097/+1124
|/ / /
* | | Merge pull request #3727 from owncloud/fix_glob_escapingBjörn Schießle2013-06-173-322/+316
|\ \ \
| * \ \ Merge branch 'master' into fix_glob_escapingBjörn Schießle2013-06-17798-6942/+7274
| |\ \ \ | |/ / / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-17542-1113/+1140
* | | | Merge pull request #3621 from owncloud/path-mimetypeThomas Müller2013-06-162-12/+31
|\ \ \ \
| * | | | Basic tests for getFileNameMimeTypeRobin Appelman2013-06-161-0/+9
| * | | | actually return resultRobin Appelman2013-06-071-2/+2
| * | | | fix variable nameRobin Appelman2013-06-071-2/+2