summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | seperate mimetype guessing from filenameRobin Appelman2013-06-061-12/+22
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-16584-1195/+1306
* | | | | Merge pull request #3301 from bastho/fix_filestrashbin_missing-sub-folderMorris Jobke2013-06-151-2/+9
|\ \ \ \ \
| * | | | | duplicate verificationBastien Ho2013-05-101-3/+0
| * | | | | Fix inexisting trashbin's sub-foldersBastien Ho2013-05-101-2/+12
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-15766-6766/+6851
* | | | | | Merge pull request #3733 from owncloud/email_templateJan-Christoph Borchardt2013-06-144-9/+56
|\ \ \ \ \ \
| * | | | | | remove » and « from the text mail because they will be escapedThomas Mueller2013-06-141-1/+1
| * | | | | | Do no translate "ownCloud - "Stephan Arts2013-06-142-4/+4
| * | | | | | Use templates to theme share e-mails (#3683)Stephan Arts2013-06-144-9/+56
* | | | | | | Merge pull request #3473 from opensaucesystems/masterThomas Müller2013-06-142-3/+9
|\ \ \ \ \ \ \
| * | | | | | | Update settings.phpopensaucesystems2013-05-231-1/+1
| * | | | | | | Remove http:// from label and add placeholderopensaucesystems2013-05-231-1/+1
| * | | | | | | Enable https authenticationopensaucesystems2013-05-231-1/+1
| * | | | | | | Enable https authenticationopensaucesystems2013-05-231-2/+8
* | | | | | | | Merge pull request #3721 from owncloud/oracle_setup_fixesThomas Müller2013-06-145-26/+47
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | remove default tablespace in parameterJörn Friedrich Dreyer2013-06-141-3/+3
| * | | | | | | adding default to $hint within ctor of DatabaseSetupExceptionThomas Mueller2013-06-141-1/+1