summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixes connecting to Oracle without port setBart Visscher2013-06-241-1/+3
|
* Skip Test_Archive_TAR in php 5.5 for nowBart Visscher2013-06-241-0/+6
|
* Fix not null with empty defaultBart Visscher2013-06-241-0/+1
|
* Merge branch 'master' into doctrineBart Visscher2013-06-241522-48949/+38774
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-06-23479-1465/+1489
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2013-06-22240-1018/+1678
| |
| * Merge pull request #3766 from owncloud/fix_display_name_editThomas Müller2013-06-211-1/+1
| |\ | | | | | | Correct new user display name output
| | * Replace display name onlyVictor Dubiniuk2013-06-181-1/+1
| | |
| * | Merge pull request #3810 from owncloud/improve_webdavauthThomas Müller2013-06-211-4/+4
| |\ \ | | | | | | | | improve error handling of webdavauth
| | * | improve error handling of webdavauthGeorg Ehrke2013-06-211-4/+4
| | | |
| * | | Merge pull request #3811 from owncloud/string_fixes_encryption_settingsLukas Reschke2013-06-211-5/+5
| |\ \ \ | | | | | | | | | | fix some strings in the admin settings of the encryption app
| | * | | fix some strings in the admin settings, it's not a 'recovery account' but a ↵Björn Schießle2013-06-211-5/+5
| |/ / / | | | | | | | | | | | | 'recovery key'
| * | | encryption is LDAP compatibleBjörn Schießle2013-06-211-1/+1
| | | |
| * | | Squashed commit of the following:Björn Schießle2013-06-212-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 1345201c9da99a82f198e41fba24da6b0d7ae59a Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 16:27:46 2013 +0200 add l10n support commit bf2c79c8de8710e839a4a55642a91874c374fa1c Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 16:19:10 2013 +0200 only init session if openssl extension is loaded commit cbd52af6afbaa310bb1a534db64ff5e476dfd5d7 Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 12:25:40 2013 +0200 first disable app and than show error page commit 55baf593179c433642de59552592e6b0f1932880 Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 12:17:34 2013 +0200 typo fixed commit 1d9bef0b058e7cc3d511b81ae12d5a07660c75b2 Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 12:15:40 2013 +0200 move dependency check to the encryption app commit c186e95da526f0470e20f014f1bd9513db5518ff Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 11:13:11 2013 +0200 make sure that openssl is installed and loaded
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-21295-605/+753
| | | |
| * | | Merge pull request #3796 from ↵Thomas Müller2013-06-201-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 upJörn Friedrich Dreyer2013-06-201-4/+6
| | | | |
| * | | | Merge pull request #3792 from owncloud/scanfolder-removeThomas Müller2013-06-202-0/+35
| |\ \ \ \ | | | | | | | | | | | | remove deleted files when re-scanning a folder
| | * | | | 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.php
| | * | | | | Update user.phpshkdee2013-06-181-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_messagesBjörn Schießle2013-06-202-26/+28
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | add some more error messages, in case something went wrong
| | * | | | | | 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
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | Give admins the ability to rescan the filesystem for multiple users at once
| | * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | guys, please ...
| * | | | | | | [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
| | * | | | | 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
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / Improve re-using existing data in the filescanner
| | * | | 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 ↵Björn Schießle2013-06-191-2/+2
| | | | | | | | | | | | | | | | | | | | config.php
| * | | | 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
| |\ \ \ \ | | | | | | | | | | | | Fixing windows server master
| | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Mueller2013-06-101-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 Mueller2013-06-101-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 Mueller2013-06-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | failing unit tests