Commit Graph

20063 Commits

Author SHA1 Message Date
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
Volkan Gezer d1f483c9ed remove obsolete japanese lang code 2014-08-13 22:35:08 +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
Arthur Schiwon 4220e0c7da it does not affect gravity on planet earth, but only for tipsy 2014-08-13 14:20:14 +02:00
Normal Ra 8e11455f27 Add APK mimetype tests. 2014-08-13 13:38:16 +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
Normal Ra 1c1fc0870a Remove stray tab characters. 2014-08-13 11:24:02 +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
Arthur Schiwon 288b6d4071 make singleselect check for gravity wish, and make it south for default quota 2014-08-12 18:04:52 +02:00
Arthur Schiwon eb7d70fc39 adjust login test to code changes 2014-08-12 16:13:17 +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
Normal Ra 1633ec5c87 APK mimetype icon to be a generic package icon. 2014-08-12 14:10:49 +02:00
Normal Ra 38498af171 Add APK mimetype repair scenario. 2014-08-12 14:07:10 +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
Vincent Petry 997653fd09 Replaced spaces with tabs in apps.js 2014-08-12 12:00:34 +02:00
Vincent Petry 25a8588f7b Fix default quota settings field
The default quota settings field is initially hidden which makes it
impossible for singleSelect() to make its width measurements.

This fix uses the app navigation slide "show" event to defer the
singleSelect() initialization on the default quota field.

Refactored setQuota() into UserList._updateQuota().
Refactored duplicate event handler code into UserList.onQuotaSelect().
2014-08-12 12:00:34 +02:00
Vincent Petry c208796c47 Use global apps slide toggle logic
Remove local app settings slide logic and make it use the global one
triggered by the "data-apps-slide-toggle" attribute.
2014-08-12 12:00:34 +02:00
Vincent Petry e1a47683ef Trigger events when app-settings visibility changes 2014-08-12 12:00:34 +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
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