Vincent Petry
79fa2bc391
Merge pull request #10301 from owncloud/fix-internal-mail-share-links
...
Don't use /Shared as a base for links in share email
2014-08-11 13:33:39 +02:00
Jörn Friedrich Dreyer
de9fe3a8d4
Merge pull request #10096 from owncloud/fix-6971-master
...
in case $_POST['itemSourceName'] does not exist we simply default it to ...
2014-08-11 13:32:16 +02:00
Robin Appelman
86ae3bd1e7
Merge pull request #10303 from owncloud/sharing-breadcrumb-folder-name
...
use OC_Util::basename
2014-08-11 13:10:45 +02:00
Thomas Müller
b83d00f847
Merge pull request #10249 from mroi/patch-1
...
file size on non-(Linux/BSD/Windows)-installations
2014-08-11 13:02:01 +02:00
Thomas Müller
c42ce20054
Merge pull request #10312 from owncloud/fix-old-japanese
...
fix old Japanese language code redirection
2014-08-11 12:55:39 +02:00
Bjoern Schiessle
bc8e1ebf75
new unit test added
2014-08-11 12:03:08 +02:00
Bjoern Schiessle
5b75b15292
no error if we try to delete a file which no longer exists
2014-08-11 12:03:08 +02:00
Bjoern Schiessle
5bbecdb9ee
no special action for folder named 'Shared' needed
2014-08-11 12:03:08 +02:00
Bjoern Schiessle
b3cff4beb6
add error message if user wants to rename a file which no longer exists
2014-08-11 12:03:08 +02:00
Jean-Louis Dupond
fc662917e7
Fix remarks in #9848
2014-08-11 09:15:56 +02:00
Morris Jobke
e9cdd68412
Merge pull request #10285 from owncloud/sharing_set_correct_min_date
...
[sharing] set minDate always to today + one day
2014-08-11 09:09:01 +02:00
Jenkins for ownCloud
411f6c7704
[tx-robot] updated from transifex
2014-08-11 01:54:32 -04:00
gekmihesg
578a57f0fb
Load authentication backends before tryBasicAuth
2014-08-10 13:29:32 +02:00
Jenkins for ownCloud
c920ca32e8
[tx-robot] updated from transifex
2014-08-10 01:55:15 -04:00
Lukas Reschke
6fae8ae8a7
Merge pull request #10302 from owncloud/remove-logon-rejected
...
remove confusing 'automatic logon rejected' message, fix #8591
2014-08-09 19:01:38 +02:00
Jan-Christoph Borchardt
6f9963b2d9
Merge pull request #10293 from owncloud/fix-headers-being-sent
...
using flush() here is pointless as we render the layout into a memory bu...
2014-08-09 18:32:44 +02:00
Volkan Gezer
bcee9d6ab7
fix old Japanese language code redirection
...
ja_JP has not been updated since March and the reference
to this language should be removed. It also exists as *ja*
on Transifex
2014-08-09 16:52:08 +02:00
Jenkins for ownCloud
f12f835485
[tx-robot] updated from transifex
2014-08-09 01:55:08 -04:00
Jan-Christoph Borchardt
c0fa29523c
remove confusing 'automatic logon rejected' message, fix #8591
2014-08-09 01:35:02 +02:00
Tom Needham
aeef10eb47
Add scrollto to the url if sharing a file for long file lists
2014-08-09 00:21:29 +01:00
Tom Needham
16dafa9cac
Fix link to files and folders in internal share emails
2014-08-09 00:08:45 +01:00
Thomas Müller
7b6b99f55a
Merge pull request #10290 from owncloud/check_quota_on_new_via_web
...
check quota when trying to download a file via new -> web
2014-08-08 17:32:50 +02:00
Thomas Müller
cbe3595f64
using flush() here is pointless as we render the layout into a memory buffer and actually transmit the data later
2014-08-08 15:44:11 +02:00
Jörn Friedrich Dreyer
c24957565c
check quota when trying to download a file via new -> web
2014-08-08 14:35:33 +02:00
Björn Schießle
6dd7d9e0af
Merge pull request #10288 from owncloud/sharing_dont_show_share_dialog
...
don't show share dialog and navigation entry if sharing was disabled for the user
2014-08-08 14:01:55 +02:00
Bjoern Schiessle
76ab097ee2
update unit test, min date should be always today + 1
2014-08-08 13:58:56 +02:00
Bjoern Schiessle
6dda30b5a2
remove share permissions if user is excluded from sharing
2014-08-08 12:16:54 +02:00
Bjoern Schiessle
008498dcad
only show "share with others" and "share by link" navigation bar entries if user is allowed to share files
2014-08-08 12:12:24 +02:00
Bjoern Schiessle
55a17a2b23
set minDate always to today + one day
2014-08-08 11:09:41 +02:00
Morris Jobke
fa260b1649
Merge pull request #10280 from owncloud/lazyloading-earlier
...
trigger lazy loading earlier, fix #9823
2014-08-08 10:02:43 +02:00
Jenkins for ownCloud
d63b9e68c4
[tx-robot] updated from transifex
2014-08-08 01:55:11 -04:00
Jan-Christoph Borchardt
5ee0a57598
trigger lazy loading earlier, fix #9823
2014-08-08 00:27:31 +02:00
Morris Jobke
5e7b164560
Merge pull request #10248 from owncloud/enc_remove_keys_from_session
...
add logout hook to remove keys from session
2014-08-07 23:01:11 +02:00
Morris Jobke
b6a2a85bb8
Merge pull request #9953 from owncloud/fix_text_preview_for_systems_without_ttf
...
implement a txt preview fallback for the case that ttf is not support
2014-08-07 22:55:06 +02:00
Thomas Müller
461fdd854f
Merge pull request #10261 from owncloud/fix-9829
...
ldap_ prefix will be added in invokeLDAPMethod(), having it would lead t...
2014-08-07 21:38:12 +02:00
Arthur Schiwon
2676e681e9
ldap_ prefix will be added in invokeLDAPMethod(), having it would lead to a unexisting function, fixes #9829
2014-08-07 17:15:36 +02:00
Morris Jobke
8cd6f9a113
Merge pull request #10172 from owncloud/fix-8802
...
Use relative, human readable dates in OC.filePickers - Fixes #8802
2014-08-07 16:14:30 +02:00
Thomas Müller
520f6422ac
Merge pull request #10079 from owncloud/Improve_scanner_message
...
Improved scanner error message
2014-08-07 16:09:52 +02:00
Thomas Müller
9d2cff50ed
shared files/folders are not mounted
2014-08-07 16:01:13 +02:00
Michael Roitzsch
cde1a9241d
file size on non-(Linux/BSD/Windows)-installations
...
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.
2014-08-07 15:41:58 +02:00
Bjoern Schiessle
0b3ddbed68
add logout hook to remove keys from session
2014-08-07 15:29:35 +02:00
Thomas Müller
e33fc2807c
Merge pull request #10142 from owncloud/fix-#9283-gzip_support
...
Removed broken tar cutter, added tar and fixed extension switch.
2014-08-07 14:53:31 +02:00
Tom Needham
93ba64a69f
Use human readable relative date for oc-dialog-filepickers
2014-08-07 13:40:52 +01:00
Thomas Müller
6da9c09467
Merge pull request #10238 from owncloud/fix-public-download-with-encryption-master
...
we can only close the session if encryption is not used
2014-08-07 14:29:54 +02:00
Robin Appelman
f1091280de
Merge pull request #10184 from owncloud/getbyid-node
...
Fix Folder::getById
2014-08-07 13:40:17 +02:00
Jan-Christoph Borchardt
9e6b65fabe
Merge pull request #10223 from dannosaur/patch-1
...
fix tiny thumbnails in public preview/share mode
2014-08-07 12:36:57 +02:00
Thomas Müller
8b2fe69bb2
Merge pull request #10218 from owncloud/pzy-master
...
Adding link tag to enable facebook timeline previews
2014-08-07 12:14:30 +02:00
Thomas Müller
d2365afad6
Merge pull request #8915 from owncloud/MorrisJobke-travis
...
Travis support for PRs and master, stable5 and stable6
2014-08-07 11:33:13 +02:00
Thomas Müller
2fb8fcf6cb
we can only close the session if encryption is not used
2014-08-07 11:07:11 +02:00
pzy
dc15633111
Update public.php
...
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
2014-08-07 10:44:07 +02:00