summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10442 from owncloud/move-failed-loginsLukas Reschke2014-08-152-7/+5
|\
| * Fix unit testLukas Reschke2014-08-151-1/+4
| * Move authentication failed logging to checkPasswordLukas Reschke2014-08-152-7/+2
* | Merge pull request #10440 from owncloud/enforce-debugClark Tomlinson2014-08-151-7/+0
|\ \
| * | Remove ability to trigger DEBUG mode via cookieLukas Reschke2014-08-151-7/+0
| |/
* | Merge pull request #9275 from NormalRa/masterLukas Reschke2014-08-153-0/+44
|\ \ | |/ |/|
| * Remove stray tab characters.Normal Ra2014-08-131-1/+1
| * APK mimetype icon to be a generic package icon.Normal Ra2014-08-121-0/+1
| * Add APK mimetype repair scenario.Normal Ra2014-08-121-0/+42
| * Add .apk mimetype.Normal Ra2014-06-281-0/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-151-14/+14
* | add missing @deprecated annotation to legacy classesJörn Friedrich Dreyer2014-08-149-2/+22
* | Merge pull request #10417 from owncloud/update_deprecation_docThomas Müller2014-08-144-4/+4
|\ \
| * | update deprecation docsJörn Friedrich Dreyer2014-08-144-4/+4
* | | Merge pull request #10399 from owncloud/fix_setSendMailStatusBjörn Schießle2014-08-142-5/+7
|\ \ \
| * | | we need the recipient as a additional parameter to know for which share the n...Bjoern Schiessle2014-08-132-5/+7
* | | | Merge pull request #10414 from owncloud/relax-code-checkerClark Tomlinson2014-08-141-4/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | in order to prevent false-positives on the code checker - exec and eval will ...Thomas Müller2014-08-141-4/+0
* | | | Merge pull request #10395 from owncloud/close-filehandle-lib-filesMorris Jobke2014-08-143-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Close open file handles in files libraryMorris Jobke2014-08-133-0/+3
| |/ /
* | | Merge pull request #10394 from owncloud/close-filehandle-lib-imageThomas Müller2014-08-131-0/+4
|\ \ \
| * | | Close file handle if exception occurs in image classMorris Jobke2014-08-131-0/+4
| |/ /
* | | Cast file id's to int so we can compare them properlyRobin Appelman2014-08-131-0/+1
* | | Merge pull request #10323 from gekmihesg/masterblizzz2014-08-131-0/+3
|\ \ \ | |/ / |/| |
| * | Load authentication backends before tryBasicAuthgekmihesg2014-08-101-0/+3
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-131-0/+1
* | | Merge pull request #9762 from owncloud/owner-publicRobin Appelman2014-08-121-0/+10
|\ \ \
| * | | Return the proper owner for home storagesRobin Appelman2014-07-211-0/+10
* | | | Merge pull request #10335 from owncloud/fix-emptyapplistClark Tomlinson2014-08-111-0/+1
|\ \ \ \
| * | | | Fix issue when no apps are enabledVincent Petry2014-08-111-0/+1
* | | | | Merge pull request #9890 from owncloud/check-php-charset-masterThomas Müller2014-08-111-0/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Removing ini charset override due to shared hosting issuesClark Tomlinson2014-08-111-3/+0
| * | | | setting and checking default_charset in php.ini to be UTF-8Thomas Müller2014-07-252-0/+10
* | | | | Merge pull request #10066 from marc0s/issues/10065-fix-null-checkClark Tomlinson2014-08-111-2/+2
|\ \ \ \ \
| * | | | | Fix checking of NULL or empty OC::$THIRDPARTYROOT/OC::$THIRDPARTYWEBROOTmarc0s2014-07-301-2/+2
* | | | | | Merge pull request #10251 from owncloud/fix-dav-attributes-masterThomas Müller2014-08-111-1/+1
|\ \ \ \ \ \
| * | | | | | shared files/folders are not mountedThomas Müller2014-08-071-1/+1
* | | | | | | Merge pull request #10301 from owncloud/fix-internal-mail-share-linksVincent Petry2014-08-111-5/+10
|\ \ \ \ \ \ \
| * | | | | | | Add scrollto to the url if sharing a file for long file listsTom Needham2014-08-091-3/+9
| * | | | | | | Fix link to files and folders in internal share emailsTom Needham2014-08-091-4/+3
* | | | | | | | Merge pull request #10249 from mroi/patch-1Thomas Müller2014-08-111-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | file size on non-(Linux/BSD/Windows)-installationsMichael Roitzsch2014-08-071-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-113-0/+6
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-102-1/+2
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-091-0/+1
| |/ / / / / |/| | | | |
* | | | | | remove share permissions if user is excluded from sharingBjoern Schiessle2014-08-081-0/+10
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-0812-1/+14
* | | | | | Merge pull request #9953 from owncloud/fix_text_preview_for_systems_without_ttfMorris Jobke2014-08-071-1/+8
|\ \ \ \ \ \
| * | | | | | implement a txt preview fallback for the case that ttf is not supportGeorg Ehrke2014-07-281-1/+8
* | | | | | | Merge pull request #10079 from owncloud/Improve_scanner_messageThomas Müller2014-08-071-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |