Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-25 | 544 | -1141/+1237 |
* | Merge pull request #3826 from owncloud/fix_webdav_locking_for_oracle | Thomas Müller | 2013-06-24 | 2 | -2/+6 |
|\ | |||||
| * | use to_char when comparing clob to string on oracle, use execute audited | Jörn Friedrich Dreyer | 2013-06-24 | 2 | -2/+6 |
|/ | |||||
* | Merge pull request #3818 from owncloud/update-trigger-cli | Thomas Müller | 2013-06-24 | 1 | -0/+22 |
|\ | |||||
| * | Add a CLI script for manually triggering checking a folder for updates | Robin Appelman | 2013-06-23 | 1 | -0/+22 |
* | | Merge pull request #3822 from owncloud/graceful_teardown_of_cache | Thomas Müller | 2013-06-24 | 1 | -1/+3 |
|\ \ | |||||
| * | | graceful teardown of cache | Jörn Friedrich Dreyer | 2013-06-24 | 1 | -1/+3 |
|/ / | |||||
* / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-24 | 534 | -1110/+1111 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-23 | 479 | -1465/+1489 |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-22 | 240 | -1018/+1678 |
* | Merge pull request #3766 from owncloud/fix_display_name_edit | Thomas Müller | 2013-06-21 | 1 | -1/+1 |
|\ | |||||
| * | Replace display name only | Victor Dubiniuk | 2013-06-18 | 1 | -1/+1 |
* | | Merge pull request #3810 from owncloud/improve_webdavauth | Thomas Müller | 2013-06-21 | 1 | -4/+4 |
|\ \ | |||||
| * | | improve error handling of webdavauth | Georg Ehrke | 2013-06-21 | 1 | -4/+4 |
* | | | Merge pull request #3811 from owncloud/string_fixes_encryption_settings | Lukas Reschke | 2013-06-21 | 1 | -5/+5 |
|\ \ \ | |||||
| * | | | fix some strings in the admin settings, it's not a 'recovery account' but a '... | Björn Schießle | 2013-06-21 | 1 | -5/+5 |
|/ / / | |||||
* | | | encryption is LDAP compatible | Björn Schießle | 2013-06-21 | 1 | -1/+1 |
* | | | Squashed commit of the following: | Björn Schießle | 2013-06-21 | 2 | -9/+18 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-21 | 295 | -605/+753 |
* | | | Merge pull request #3796 from owncloud/gracefully_handle_teardown_in_scanner_... | Thomas Müller | 2013-06-20 | 1 | -4/+6 |
|\ \ \ | |||||
| * | | | 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 |
|\ \ \ \ | |||||
| * | | | | 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 | shkdee | 2013-06-18 | 1 | -1/+1 |
* | | | | | | Merge pull request #3788 from owncloud/more_error_messages | Björn Schießle | 2013-06-20 | 2 | -26/+28 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | 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 |
* | | | | | | | [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, 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 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | 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 con... | Björn Schießle | 2013-06-19 | 1 | -2/+2 |
* | | | | 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 |
|\ \ \ \ | |||||
| * | | | | 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 |