summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Improved scanner error messageMartin2014-07-311-1/+1
* | | | | | Merge pull request #10142 from owncloud/fix-#9283-gzip_supportThomas Müller2014-08-072-8/+7
|\ \ \ \ \ \
| * | | | | | Previous commit was not based on master, retry. Removed broken tar cutter, do...Remco Brenninkmeijer2014-08-042-8/+7
* | | | | | | Merge pull request #10184 from owncloud/getbyid-nodeRobin Appelman2014-08-072-42/+27
|\ \ \ \ \ \ \
| * | | | | | | Fix SharedCache::getPathByIdRobin Appelman2014-08-061-1/+1
| * | | | | | | return null instead of throwing an exceptionRobin Appelman2014-08-061-2/+1
| * | | | | | | Fix Folder::getByIdRobin Appelman2014-08-052-39/+25
* | | | | | | | Merge pull request #8915 from owncloud/MorrisJobke-travisThomas Müller2014-08-072-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Minor fixesMorris Jobke2014-08-051-0/+1
| * | | | | | | | Make View->shouldEmitHooks more robustRobin Appelman2014-08-051-0/+3
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-0715-12/+5
* | | | | | | | | typo fix from transifex suggestionVolkan Gezer2014-08-061-2/+2
* | | | | | | | | Merge pull request #10144 from owncloud/issue/9972Thomas Müller2014-08-064-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix isLoggedIn() check for user '0'Joas Schilling2014-08-042-2/+2
| * | | | | | | | | Fix getting group '0' from database backendJoas Schilling2014-08-042-2/+2
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-0612-0/+25
* | | | | | | | | | Merge pull request #10191 from owncloud/sharing_rm_trailing_slashMorris Jobke2014-08-051-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove trailing slash from pathBjoern Schiessle2014-08-051-1/+2
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #9520 from owncloud/theme_urlsBjörn Schießle2014-08-052-13/+57
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | remove escaping because it's unneededMorris Jobke2014-08-051-1/+1