summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10301 from owncloud/fix-internal-mail-share-linksVincent Petry2014-08-111-5/+10
|\ | | | | Don't use /Shared as a base for links in share email
| * 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)-installations
| * | file size on non-(Linux/BSD/Windows)-installationsMichael Roitzsch2014-08-071-1/+1
| | | | | | | | | Determining the file size using the exec() method is implemented for Linux, BSD, and Windows. However, on systems matching neither platform name (like SunOS), the fall-through path will return a file size result constituting a zero size instead of an invalid null return value.
* | | [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 support
| * | 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 message
| * | Improved scanner error messageMartin2014-07-311-1/+1
| | |
* | | Merge pull request #10142 from owncloud/fix-#9283-gzip_supportThomas Müller2014-08-072-8/+7
|\ \ \ | | | | | | | | Removed broken tar cutter, added tar and fixed extension switch.
| * | | Previous commit was not based on master, retry. Removed broken tar cutter, ↵Remco Brenninkmeijer2014-08-042-8/+7
| | | | | | | | | | | | | | | | double extensions are not possible in temp files. Added tar support. Fixed extension switch.
* | | | Merge pull request #10184 from owncloud/getbyid-nodeRobin Appelman2014-08-072-42/+27
|\ \ \ \ | | | | | | | | | | Fix Folder::getById
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Travis support for PRs and master, stable5 and stable6
| * | | | | Minor fixesMorris Jobke2014-08-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * instanceof \OC\Files\View * fix misplaced paranthesis * remove misplaced character in comment
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Issue/9972 Fix issues with group and username `0`
| * | | | | | Fix isLoggedIn() check for user '0'Joas Schilling2014-08-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #9972
| * | | | | | Fix getting group '0' from database backendJoas Schilling2014-08-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #9972
* | | | | | | [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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [sharing] remove trailing slash
| * | | | | | | 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
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Add ability to theme iOS and Android client URLs just like desktop URLs.
| * | | | | | remove escaping because it's unneededMorris Jobke2014-08-051-1/+1
| | | | | | |
| * | | | | | fix uppercase issueMorris Jobke2014-08-051-4/+4
| | | | | | |
| * | | | | | Add ability to theme iOS and Android client URLs just like desktop URLs.scolebrook2014-08-052-13/+57
| |/ / / / /
* / / / / / don't display share permission if resharing was disabled by the adminBjoern Schiessle2014-08-052-1/+10
|/ / / / /
* | | | | Merge pull request #10151 from owncloud/issue/9912Morris Jobke2014-08-051-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Increase word wrap limit for emails to 78 characters
| * | | | | Increase word wrap limit for emails to 78 charactersJoas Schilling2014-08-041-5/+5
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-0519-38/+0
| | | | | |
* | | | | | Merge pull request #10083 from th3fallen/fix-9969-take-twoJoas Schilling2014-08-042-37/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix 9969
| * | | | | | Removing unnecessary switch statements in fopen methods.Clark Tomlinson2014-07-312-37/+9
| | | | | | |
* | | | | | | Merge pull request #10138 from owncloud/innodb-repair-non-ocThomas Müller2014-08-041-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Dont touch non-oc tables when doing the InnoDB repair step
| * | | | | | Dont touch non-oc tables when doing the InnoDB repair stepRobin Appelman2014-08-041-1/+1
| | | | | | |
* | | | | | | Merge pull request #10025 from owncloud/l10n-typoThomas Müller2014-08-041-8/+8
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | typo fix from transifex suggestion
| * | | | | | expire -> expirationVolkan Gezer2014-08-021-6/+6
| | | | | | |
| * | | | | | suggestions by deepdiverVolkan Gezer2014-08-011-4/+4
| | | | | | |
| * | | | | | typo fix from transifex suggestionVolkan Gezer2014-07-301-2/+2
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-022-2/+11
| |/ / / / / |/| | | | |
* | | | | | fix return documentationJörn Friedrich Dreyer2014-08-011-7/+5
| | | | | |
* | | | | | prevent PHP errors and enhance loggingThomas Müller2014-08-011-1/+5
| | | | | |