Commit Graph

19972 Commits

Author SHA1 Message Date
Volkan Gezer 44ec8060a8 Merge pull request #10347 from owncloud/fix-grammar
Transifex suggestion by mnestis
2014-08-11 23:35:05 +02:00
Clark Tomlinson e63853a353 Merge pull request #10335 from owncloud/fix-emptyapplist
Fix issue when no apps are enabled
2014-08-11 16:16:18 -04:00
Thomas Müller 3e493501da Merge pull request #9890 from owncloud/check-php-charset-master
setting and checking default_charset in php.ini to be UTF-8
2014-08-11 22:11:11 +02:00
Volkan Gezer 4dd9414f2c Transifex suggestion by mnestis 2014-08-11 21:31:15 +02:00
Vincent Petry a32eac1477 Fix issue when no apps are enabled
Properly initialize $apps array
2014-08-11 20:36:51 +02:00
Clark Tomlinson 691306cf4e Removing ini charset override due to shared hosting issues 2014-08-11 12:15:36 -04:00
Joas Schilling 564bf23c1b Do not filemtime() on "." directory. Use empty string instead
Fix #9928
2014-08-11 17:39:37 +02:00
Björn Schießle 6aa8693198 Merge pull request #10336 from owncloud/fix_share_drop_down
remove 'no people found' entry in share dialog
2014-08-11 17:39:04 +02:00
blizzz c46b60e822 Merge pull request #9848 from dupondje/master
Fix memberOf detection. Fixes: #9835
2014-08-11 16:58:30 +02:00
Robin Appelman 482bca1713 Fix Tar support for php >=5.5 2014-08-11 16:56:36 +02:00
Joas Schilling d7666d9d3d Remove doubled slash between folder and path 2014-08-11 16:50:52 +02:00
Clark Tomlinson 7bc313a0cd Merge pull request #10066 from marc0s/issues/10065-fix-null-check
Fix checking of NULL or empty OC::$THIRDPARTYROOT/OC::$THIRDPARTYWEBROOT
2014-08-11 10:44:47 -04:00
Arthur Schiwon fc6793f2ae better check whether string resembles a DN, fixes #9887 2014-08-11 16:40:41 +02:00
Bjoern Schiessle 54b5cecfb8 remove 'no people found' entry 2014-08-11 16:03:47 +02:00
Thomas Müller 13d44f8f7f Merge pull request #10251 from owncloud/fix-dav-attributes-master
shared files/folders are not mounted
2014-08-11 14:40:47 +02:00
Jean-Louis Dupond e46fc7a18a Fix initializing in #9848 2014-08-11 13:50:13 +02:00
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