Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3796 from ↵ | Thomas Müller | 2013-06-20 | 1 | -4/+6 |
|\ | | | | | | | | | owncloud/gracefully_handle_teardown_in_scanner_test skip teardown if cache has not been set up | ||||
| * | skip teardown if cache has not been set up | Jörn Friedrich Dreyer | 2013-06-20 | 1 | -4/+6 |
| | | |||||
* | | Merge pull request #3792 from owncloud/scanfolder-remove | Thomas Müller | 2013-06-20 | 2 | -0/+35 |
|\ \ | | | | | | | remove deleted files when re-scanning a folder | ||||
| * | | adding unit test for folder remove: testRemovedFolder() | Thomas Mueller | 2013-06-20 | 1 | -0/+11 |
| | | | |||||
| * | | Merge branch 'rescan-all' into scanfolder-remove | Thomas Mueller | 2013-06-20 | 2 | -15/+45 |
| |\ \ | |||||
| * | | | remove deleted files when re-scanning a folder | Robin Appelman | 2013-06-20 | 2 | -0/+24 |
| | | | | |||||
* | | | | Merge pull request #3779 from shkdee/patch-1 | blizzz | 2013-06-20 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | Update user.php | ||||
| * | | | Update user.php | shkdee | 2013-06-18 | 1 | -1/+1 |
| | | | | | | | | | | | | Fixes $_setupedBackends[] into self::$_setupedBackends[] so that setuped backends are REALLY remembered and not instanciated many times. | ||||
* | | | | Merge pull request #3788 from owncloud/more_error_messages | Björn Schießle | 2013-06-20 | 2 | -26/+28 |
|\ \ \ \ | | | | | | | | | | | add some more error messages, in case something went wrong | ||||
| * | | | | always have a defined return value | Björn Schießle | 2013-06-19 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | some more error messages | Björn Schießle | 2013-06-19 | 1 | -5/+3 |
| | | | | | |||||
| * | | | | add some more error messages, in case something went wrong | Björn Schießle | 2013-06-19 | 2 | -24/+28 |
| | | | | | |||||
* | | | | | Merge pull request #3784 from owncloud/rescan-all | Thomas Müller | 2013-06-20 | 2 | -15/+45 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | Give admins the ability to rescan the filesystem for multiple users at once | ||||
| * | | | | use json to encode user list | Robin Appelman | 2013-06-19 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | allow scanning files for multiple users | Robin Appelman | 2013-06-19 | 2 | -15/+45 |
| | | | | | |||||
* | | | | | add missing backticks | Jörn Friedrich Dreyer | 2013-06-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | guys, please ... | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-20 | 580 | -2126/+2500 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #3783 from owncloud/improved_wording | Michael Gapczynski | 2013-06-19 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | fixed enghlish sentence | ||||
| * | | | | fixed enghlish sentence, thanks to @MTGap | Björn Schießle | 2013-06-19 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #3764 from owncloud/scanfolder-existing | icewind1991 | 2013-06-19 | 4 | -36/+70 |
|\ \ \ \ | |/ / / |/| / / | |/ / | Improve re-using existing data in the filescanner | ||||
| * | | fix updaters test cases | Robin Appelman | 2013-06-19 | 1 | -2/+1 |
| | | | |||||
| * | | add tests for reusing existing data in scanner | Robin Appelman | 2013-06-17 | 2 | -5/+21 |
| | | | |||||
| * | | reuse etag when doing a forced rescan | Robin Appelman | 2013-06-14 | 1 | -1/+1 |
| | | | |||||
| * | | scanner: give more percision about what data is reused during scanning | Robin Appelman | 2013-06-14 | 1 | -17/+29 |
| | | | |||||
| * | | split of scanning the childs of a folder | Robin Appelman | 2013-06-14 | 1 | -17/+24 |
| | | | |||||
* | | | also use the default theme if the theme is set to an empty string in the ↵ | Björn Schießle | 2013-06-19 | 1 | -2/+2 |
| | | | | | | | | | | | | config.php | ||||
* | | | fix lost password page, don't show checkbox is encryption is not enabled | Björn Schießle | 2013-06-19 | 2 | -6/+6 |
| | | | |||||
* | | | Merge pull request #3661 from owncloud/fixing-windows-server-master | Jörn Friedrich Dreyer | 2013-06-19 | 4 | -6/+137 |
|\ \ \ | | | | | | | | | Fixing windows server master | ||||
| * | | | dirname('/test.txt') returns '\' on windows whereas on linux we get back '.' | Thomas Mueller | 2013-06-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | restore Updater functionality on non-Windows platforms | Thomas Mueller | 2013-06-13 | 1 | -4/+4 |
| | | | | |||||
| * | | | Add tests for the updater with mount points | Michael Gapczynski | 2013-06-12 | 1 | -3/+125 |
| | | | | |||||
| * | | | [Fixing unit tests in Windows] | Thomas Mueller | 2013-06-10 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | on windows open resources will be locked while the stream is open. closing the resource allows deletion below | ||||
| * | | | [Fixing Updater Unit Tests on Windows] | Thomas Mueller | 2013-06-10 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | using $internalPath within call to self::correctFolder() because $path inside of it is not processed properly due to directory separator on Windows. | ||||
| * | | | [Fixing Updater Unit Tests on Windows] | Thomas Mueller | 2013-06-10 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | using $internalPath within call to self::correctFolder() because $path inside of it is not processed properly due to directory separator on Windows. error logging has been added in case the given 4path is not found within self::correctFolder | ||||
| * | | | Let's just use '/' as we do almost everywhere - this change fixes two ↵ | Thomas Mueller | 2013-06-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | failing unit tests | ||||
* | | | | Merge pull request #3773 from owncloud/port_3596 | Thomas Müller | 2013-06-19 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Users page: username instead of login name as col header to avoid confus... | ||||
| * | | | | Users page: username instead of login name as col header to avoid confusion ↵ | Arthur Schiwon | 2013-06-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | with other backends | ||||
* | | | | | Merge pull request #3765 from owncloud/hide-logo-claim | Frank Karlitschek | 2013-06-18 | 2 | -2/+2 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | hide the logo claim in case the theme is not loaded | ||||
| * | | | | hide the logo claim in case the theme is not loaded | Jan-Christoph Borchardt | 2013-06-17 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #3774 from owncloud/fix_sql_in_vcategories | Thomas Müller | 2013-06-18 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | remove dangling AND in SQL statement | ||||
| * | | | | remove dangling AND in SQL statement | Jörn Friedrich Dreyer | 2013-06-18 | 1 | -1/+1 |
|/ / / / | |||||
* / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-18 | 542 | -1097/+1124 |
|/ / / | |||||
* | | | Merge pull request #3727 from owncloud/fix_glob_escaping | Björn Schießle | 2013-06-17 | 3 | -322/+316 |
|\ \ \ | | | | | | | | | only escape glob pattern | ||||
| * \ \ | Merge branch 'master' into fix_glob_escaping | Björn Schießle | 2013-06-17 | 798 | -6942/+7274 |
| |\ \ \ | |/ / / |/| | | | | | | | | | | | Conflicts: apps/files_trashbin/lib/trash.php | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-17 | 542 | -1113/+1140 |
| | | | | |||||
* | | | | Merge pull request #3621 from owncloud/path-mimetype | Thomas Müller | 2013-06-16 | 2 | -12/+31 |
|\ \ \ \ | | | | | | | | | | | seperate mimetype guessing from filename | ||||
| * | | | | Basic tests for getFileNameMimeType | Robin Appelman | 2013-06-16 | 1 | -0/+9 |
| | | | | | |||||
| * | | | | actually return result | Robin Appelman | 2013-06-07 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | fix variable name | Robin Appelman | 2013-06-07 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | seperate mimetype guessing from filename | Robin Appelman | 2013-06-06 | 1 | -12/+22 |
| | | | | |