Commit graph

19848 commits

Author SHA1 Message Date
Jenkins for ownCloud
93f5e90c9f [tx-robot] updated from transifex 2014-08-15 01:56:14 -04:00
Morris Jobke
e4595311b4 Merge pull request #10434 from owncloud/update_deprecation_doc
add missing @deprecated annotation to legacy classes
2014-08-15 01:23:07 +02:00
Jan-Christoph Borchardt
f6a6f8541a Merge pull request #10374 from ogasser/compare_upload_limit_against_biggest_file
Compare upload limit against biggest file
2014-08-14 23:24:18 +02:00
Jörn Friedrich Dreyer
799fb46927 add missing @deprecated annotation to legacy classes 2014-08-14 22:18:12 +02:00
Thomas Müller
c1102b1671 Merge pull request #10417 from owncloud/update_deprecation_doc
update deprecation docs
2014-08-14 17:54:23 +02:00
Björn Schießle
64c3fe670c Merge pull request #10399 from owncloud/fix_setSendMailStatus
[sharing] fix mail notification
2014-08-14 17:45:39 +02:00
Robin Appelman
a645da3640 Merge pull request #10398 from owncloud/external-share-ssl-warn
Give a better error message for external shares with self-signed ssl certificates
2014-08-14 16:10:29 +02:00
Clark Tomlinson
4502eaf9f8 Merge pull request #10414 from owncloud/relax-code-checker
in order to prevent false-positives on the code checker - exec and eval ...
2014-08-14 09:35:20 -04:00
Volkan Gezer
a4b416f115 Merge pull request #10410 from owncloud/typo
ascii typo
2014-08-14 12:23:49 +02:00
Jörn Friedrich Dreyer
fd798fd982 update deprecation docs 2014-08-14 12:22:34 +02:00
Björn Schießle
27d94e9273 Merge pull request #10295 from owncloud/file_actions_error_handling
file actions improved error handling
2014-08-14 11:44:50 +02:00
Morris Jobke
987a0565fb Merge pull request #10395 from owncloud/close-filehandle-lib-files
Close open file handles in files library
2014-08-14 10:57:54 +02:00
Thomas Müller
a4932dc5e2 in order to prevent false-positives on the code checker - exec and eval will not longer be grepped for 2014-08-14 10:48:42 +02:00
Jenkins for ownCloud
67b7160e7b [tx-robot] updated from transifex 2014-08-14 01:55:35 -04:00
Volkan Gezer
46309a9ee4 ascii typo 2014-08-14 00:32:08 +02:00
Thomas Müller
fc462c5edb Merge pull request #10396 from owncloud/kill-filesync
Kill filesync.php in files/appinfo
2014-08-13 23:56:59 +02:00
Thomas Müller
6d94fc846d Merge pull request #10394 from owncloud/close-filehandle-lib-image
Close file handle if exception occurs in image class
2014-08-13 22:41:33 +02:00
Lukas Reschke
2c8aa3751c Merge pull request #10403 from owncloud/getid-cast-int
Cast file id's to int so we can compare them properly
2014-08-13 20:11:08 +02:00
Robin Appelman
bba59bf815 Cast file id's to int so we can compare them properly 2014-08-13 19:18:34 +02:00
Bjoern Schiessle
d9f35d8c15 we need the recipient as a additional parameter to know for which share the notification was send 2014-08-13 17:02:51 +02:00
Robin Appelman
9509bc403a Give a better error message for external shares with self-signed ssl certificates 2014-08-13 16:46:04 +02:00
blizzz
54491e8c68 Merge pull request #10323 from gekmihesg/master
Load authentication backends before tryBasicAuth
2014-08-13 16:08:48 +02:00
Morris Jobke
cad52dbce9 Kill filesync.php in files/appinfo
* ref comment: https://github.com/owncloud/core/issues/10392#issuecomment-52050567
2014-08-13 15:58:43 +02:00
Morris Jobke
c6bf51c457 Close open file handles in files library
ref #10392
2014-08-13 15:48:32 +02:00
Morris Jobke
f61658945f Close file handle if exception occurs in image class
ref #10392
2014-08-13 15:19:58 +02:00
Thomas Müller
9ab0ebbedc Merge pull request #10387 from owncloud/quick_fix_for_unit_tests
don't clean up the test environment if a data provider was finished
2014-08-13 15:01:29 +02:00
Vincent Petry
f282a5cff0 Merge pull request #9754 from owncloud/enc_support_aes_256
[encryption] support aes 256
2014-08-13 12:34:21 +02:00
Bjoern Schiessle
1e0e870e18 don't clean up the test environment if a data provider was finished 2014-08-13 11:41:11 +02:00
Thomas Müller
fc46fbd154 Merge pull request #10333 from owncloud/tar-55
Fix Tar support for php >=5.5
2014-08-13 11:10:18 +02:00
Jenkins for ownCloud
609a52ebe2 [tx-robot] updated from transifex 2014-08-13 01:54:44 -04:00
Morris Jobke
b4fd5fb275 Merge pull request #10377 from owncloud/git-fixes
fixes from git push force
2014-08-12 23:15:09 +02:00
Morris Jobke
d4eaa74b76 fixes from git push force 2014-08-12 21:29:05 +02:00
Bjoern Schiessle
c67fee3abd fix broken variable name, recoveryPasswordSupported is now recoveryEnabledForUser 2014-08-12 21:15:55 +02:00
Bjoern Schiessle
53c5a84eac add unit tests 2014-08-12 21:15:39 +02:00
Bjoern Schiessle
da1feafc78 fix detection of system wide mount points 2014-08-12 21:14:22 +02:00
Oliver Gasser
eb2669448d Compare upload limit against biggest file
When uploading multiple files from the web interface, compare the PHP
upload limit against the largest file, not against the sum of all files.
2014-08-12 19:46:04 +02:00
Robin Appelman
174805f5e3 Merge pull request #9762 from owncloud/owner-public
Return the proper owner for home storages
2014-08-12 14:29:17 +02:00
Volkan Gezer
e18b0fca47 Merge pull request #10357 from owncloud/l10n-alert-fix
Fix alert text
2014-08-12 13:56:33 +02:00
Jenkins for ownCloud
e4221869c2 [tx-robot] updated from transifex 2014-08-12 01:56:16 -04:00
Volkan Gezer
f2a775acb8 Fix alert text 2014-08-12 01:13:30 +02:00
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
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
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