aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | in case $_POST['itemSourceName'] does not exist we simply default it to nullThomas Müller2014-08-011-1/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #10303 from owncloud/sharing-breadcrumb-folder-nameRobin Appelman2014-08-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | use OC_Util::basename
| * | | | | | | | | | | use OC_Util::basenameRobin Appelman2014-01-151-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | 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.
* | | | | | | | | | | | Merge pull request #10312 from owncloud/fix-old-japaneseThomas Müller2014-08-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | fix old Japanese language code redirection
| * | | | | | | | | | | fix old Japanese language code redirectionVolkan Gezer2014-08-091-1/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ja_JP has not been updated since March and the reference to this language should be removed. It also exists as *ja* on Transifex
* | | | | | | | | | | Merge pull request #10285 from owncloud/sharing_set_correct_min_dateMorris Jobke2014-08-112-5/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [sharing] set minDate always to today + one day
| * | | | | | | | | | | update unit test, min date should be always today + 1Bjoern Schiessle2014-08-081-3/+5
| | | | | | | | | | | |
| * | | | | | | | | | | set minDate always to today + one dayBjoern Schiessle2014-08-081-2/+8
| | | | | | | | | | | |
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-1145-206/+312
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-10221-3345/+1595
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #10302 from owncloud/remove-logon-rejectedLukas Reschke2014-08-091-8/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | remove confusing 'automatic logon rejected' message, fix #8591
| * | | | | | | | | | | remove confusing 'automatic logon rejected' message, fix #8591Jan-Christoph Borchardt2014-08-091-8/+0
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #10293 from owncloud/fix-headers-being-sentJan-Christoph Borchardt2014-08-093-3/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | using flush() here is pointless as we render the layout into a memory bu...
| * | | | | | | | | | | using flush() here is pointless as we render the layout into a memory buffer ↵Thomas Müller2014-08-083-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and actually transmit the data later
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-09146-1199/+1830
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #10290 from owncloud/check_quota_on_new_via_webThomas Müller2014-08-081-0/+23
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | check quota when trying to download a file via new -> web
| * | | | | | | | | | check quota when trying to download a file via new -> webJörn Friedrich Dreyer2014-08-081-0/+23
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #10288 from owncloud/sharing_dont_show_share_dialogBjörn Schießle2014-08-082-18/+32
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | don't show share dialog and navigation entry if sharing was disabled for the user
| * | | | | | | | | remove share permissions if user is excluded from sharingBjoern Schiessle2014-08-081-0/+10
| | | | | | | | | |
| * | | | | | | | | only show "share with others" and "share by link" navigation bar entries if ↵Bjoern Schiessle2014-08-081-18/+22
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | user is allowed to share files
* | | | | | | | | Merge pull request #10280 from owncloud/lazyloading-earlierMorris Jobke2014-08-081-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | trigger lazy loading earlier, fix #9823
| * | | | | | | | | trigger lazy loading earlier, fix #9823Jan-Christoph Borchardt2014-08-081-1/+1
| | | | | | | | | |
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-08194-1837/+1772
|/ / / / / / / / /
* | | | | | | | | Merge pull request #10248 from owncloud/enc_remove_keys_from_sessionMorris Jobke2014-08-074-4/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | add logout hook to remove keys from session
| * | | | | | | | | add logout hook to remove keys from sessionBjoern Schiessle2014-08-074-4/+19
| | | | | | | | | |
* | | | | | | | | | 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 #10261 from owncloud/fix-9829Thomas Müller2014-08-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ldap_ prefix will be added in invokeLDAPMethod(), having it would lead t...
| * | | | | | | | | | | ldap_ prefix will be added in invokeLDAPMethod(), having it would lead to a ↵Arthur Schiwon2014-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unexisting function, fixes #9829
* | | | | | | | | | | | Merge pull request #10172 from owncloud/fix-8802Morris Jobke2014-08-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Use relative, human readable dates in OC.filePickers - Fixes #8802
| * | | | | | | | | | | | Use human readable relative date for oc-dialog-filepickersTom Needham2014-08-071-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | 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 #10238 from ↵Thomas Müller2014-08-071-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix-public-download-with-encryption-master we can only close the session if encryption is not used
| * | | | | | | | | | | | | | we can only close the session if encryption is not usedThomas Müller2014-08-071-1/+4
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #10184 from owncloud/getbyid-nodeRobin Appelman2014-08-074-61/+159
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Folder::getById
| * | | | | | | | | | | | | | trim leading slashRobin Appelman2014-08-061-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix SharedCache::getPathByIdRobin Appelman2014-08-062-21/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | return null instead of throwing an exceptionRobin Appelman2014-08-062-6/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix Folder::getByIdRobin Appelman2014-08-053-39/+154
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #10223 from dannosaur/patch-1Jan-Christoph Borchardt2014-08-071-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix tiny thumbnails in public preview/share mode
| * | | | | | | | | | | | | | | fix tiny thumbnails in public preview/share modeDan Jones2014-08-061-0/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #10218 from owncloud/pzy-masterThomas Müller2014-08-071-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | Adding link tag to enable facebook timeline previews
| * | | | | | | | | | | | | | | Update public.phppzy2014-08-071-0/+5
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added tag to make facebook load a preview picture Update public.php add check ifMimeSupported and put the thumbsize in a variable generate preview for all supported mimes
* | | | | | | | | | | | | | | Merge pull request #8915 from owncloud/MorrisJobke-travisThomas Müller2014-08-0714-6/+367
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | Travis support for PRs and master, stable5 and stable6
| * | | | | | | | | | | | | | execute unit test for files external in separate build configThomas Müller2014-08-051-0/+9
| | | | | | | | | | | | | | |