summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-1732-62/+40
* Merge pull request #6438 from owncloud/core-logexceptionfixThomas Müller2013-12-172-4/+2
|\
| * Do not use L10n when logging exceptionsVincent Petry2013-12-162-4/+2
* | Use DEBUG instead of ERROR when favourites not found. Fix #6419Thomas Tanghus2013-12-161-1/+1
* | Merge pull request #6315 from owncloud/ingroup-cacheicewind19912013-12-161-7/+18
|\ \ | |/ |/|
| * remove unneeded ; in commentRobin Appelman2013-12-121-1/+1
| * user Group->users as assosiative arrayRobin Appelman2013-12-111-5/+3
| * cache the result from inGroupRobin Appelman2013-12-111-7/+20
* | [tx-robot] updated from transifexJenkins for ownCloud2013-12-131-0/+1
* | dont try to register background jobs if we haven't upgraded yetRobin Appelman2013-12-132-46/+51
* | coding styleArthur Schiwon2013-12-131-0/+1
* | coding styleArthur Schiwon2013-12-131-1/+1
* | On webdav sesssions, loginname was compared to username which does not need t...Arthur Schiwon2013-12-132-4/+37
* | rely only on php DateTime to parse the db datetime stringJörn Friedrich Dreyer2013-12-131-3/+2
* | Merge pull request #6390 from owncloud/migration-fixwebrootVincent Petry2013-12-131-0/+1
|\ \
| * | Fix webroot for update pageVincent Petry2013-12-131-0/+1
| |/
* | Merge pull request #6318 from owncloud/gethome-cacheThomas Müller2013-12-132-67/+74
|\ \
| * | fix fallback overwriting result of getHomeRobin Appelman2013-12-121-1/+2
| * | cache the home folder of a UserRobin Appelman2013-12-112-67/+73
| |/
* / Send "SET NAMES utf8" to MySQL for PHP below 5.3.6Andreas Fischer2013-12-111-0/+3
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-091-0/+8
* Merge pull request #6231 from owncloud/fix-plural-l10nblizzz2013-12-091-1/+1
|\
| * fix plural translation - fixes #6226Morris Jobke2013-12-071-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-12-072-4/+21
|/
* Merge pull request #6150 from owncloud/backgroundjob-log-exceptionblizzz2013-12-063-7/+27
|\
| * remove background jobs if they are failingRobin Appelman2013-12-021-0/+1
| * Catch exceptions from background jobs and log themRobin Appelman2013-12-023-7/+26
* | Merge pull request #6201 from owncloud/backgroundscan-reuse-etagVincent Petry2013-12-061-1/+1
|\ \
| * \ Merge branch 'master' into backgroundscan-reuse-etagRobin Appelman2013-12-064-19/+34
| |\ \
| * | | reuse etags when doing a background scanRobin Appelman2013-12-051-1/+1
* | | | XSendfile and encryption don't work togetherBart Visscher2013-12-061-0/+3
* | | | Users of getFolderContent are mostly interested in the unecrypted file sizeBart Visscher2013-12-061-0/+4
| |/ / |/| |
* | | Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expireBjörn Schießle2013-12-061-14/+21
|\ \ \
| * | | add a optional parameter to skip check for expired files, this is necessary t...Bjoern Schiessle2013-12-051-14/+21
| |/ /
* | | Revert "Revert "Fix user's displayName being overwritten by (old) cookie""Morris Jobke2013-12-051-1/+0
* | | Revert "Fix user's displayName being overwritten by (old) cookie"Morris Jobke2013-12-051-0/+1
* | | Fix user's displayName being overwritten by (old) cookieNico Kaiser2013-12-051-1/+0
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-042-4/+13
|/ /
* | Merge pull request #6169 from owncloud/php_version_warningMorris Jobke2013-12-041-2/+10
|\ \
| * | lower required php version to 5.3.3Frank Karlitschek2013-12-041-2/+10
* | | Merge pull request #6168 from owncloud/extstorage-testtestmethodFrank Karlitschek2013-12-031-0/+8
|\ \ \
| * | | Added unit test for the test() methodVincent Petry2013-12-031-0/+8
| | |/ | |/|
* | | Merge pull request #6076 from owncloud/fix-6073-masterThomas Müller2013-12-032-24/+43
|\ \ \ | |_|/ |/| |
| * | fixing PHPDoc and spellingThomas Mueller2013-12-022-6/+8
| * | Use getLastError() everywhere.Andreas Fischer2013-11-281-10/+10
| * | Add getLastError()Andreas Fischer2013-11-281-3/+20
| * | No function as oci_last_error. It's oci_error.Andreas Fischer2013-11-281-1/+1
| * | There is no property such as dbusername. It's 'dbuser'.Andreas Fischer2013-11-281-3/+3
| * | Correct property name. It's 'dbpassword', with the 'db' prefix.Andreas Fischer2013-11-281-1/+1
| * | Correct property name. It's just 'tableprefix', without the 'db' prefix.Andreas Fischer2013-11-281-1/+1