Commit Graph

12448 Commits

Author SHA1 Message Date
Jan-Christoph Borchardt b632b8f4e4 force show loading icon also for IE 2013-08-16 00:02:11 +02:00
Jan-Christoph Borchardt 1a1c100719 fix loading.gif size for both upload and deletion, force visiblity 2013-07-30 10:44:01 +02:00
Victor Dubiniuk 33fe24dc3d Replace delete icon with spinner 2013-07-29 19:27:11 +03:00
Thomas Müller 2a42021815 Merge branch 'master' into delete-fix
Conflicts:
	core/css/styles.css
2013-07-23 16:24:34 +02:00
Victor Dubiniuk cdb993ad69 Explicit ie8 fallback 2013-07-23 17:13:12 +03:00
Jenkins for ownCloud a94c55be98 [tx-robot] updated from transifex 2013-07-23 02:03:19 -04:00
Thomas Müller 6ddad8dc49 Merge pull request #4126 from owncloud/parallel-autotest.sh-master
Parallel autotest.sh master
2013-07-22 14:48:49 -07:00
Andreas Fischer 7abf35b085 Merge pull request #4156 from owncloud/fix_oc_image_reference
* owncloud/fix_oc_image_reference:
  need to use \OC_Image to escape OCP namespace
2013-07-22 19:19:01 +02:00
Jörn Friedrich Dreyer cb4cf3e2f7 need to use \OC_Image to escape OCP namespace 2013-07-22 17:25:55 +02:00
Kondou bc86ce00cf Merge pull request #4154 from owncloud/return-ocl10n
return result from getL10N
2013-07-22 08:05:32 -07:00
VicDeo f3c19d72b2 Merge pull request #4071 from owncloud/fix_return_value_search_principals
OC_Connector_Sabre_Principal::searchPrincipals - return empty array instead of 0
2013-07-22 07:16:47 -07:00
Robin Appelman d509a0c403 return result from getL10N 2013-07-22 15:52:02 +02:00
Georg Ehrke f1e939e1a3 Merge branch 'master' into fix_return_value_search_principals 2013-07-22 15:30:57 +02:00
Thomas Müller 57d178274d Merge pull request #3142 from owncloud/ext-fs-irods-master
Ext fs irods master
2013-07-22 05:16:49 -07:00
Thomas Müller f9f013bba7 Merge pull request #4045 from owncloud/disable-anon-upload-master
Disable anon upload master
2013-07-22 04:04:59 -07:00
Thomas Müller 840e96cda3 Merge branch 'master' into disable-anon-upload-master
Conflicts:
	settings/templates/admin.php
2013-07-22 11:55:20 +02:00
Thomas Müller 7b28f5a82c Merge branch 'master' into ext-fs-irods-master 2013-07-22 11:40:28 +02:00
Thomas Müller 6e2418141d Merge branch 'master' into parallel-autotest.sh-master 2013-07-22 11:39:27 +02:00
Thomas Müller 934f2e94a3 Merge branch 'master' into disable-anon-upload-master 2013-07-22 11:36:52 +02:00
Morris Jobke 342a54bf7b Merge pull request #2980 from owncloud/===_and_!==_in_settings
Use !== and === in settings.
2013-07-22 02:32:40 -07:00
Thomas Müller a2cdf8b91e Merge pull request #3925 from berendt/reworking_OC_Files_Storage_AmazonS3
reworking of \OC\Files\Storage\AmazonS3
2013-07-22 02:19:27 -07:00
Jan-Christoph Borchardt dba4111aa0 fix delete button not showing in IE8 2013-07-22 11:18:51 +02:00
Björn Schießle da892d69ab if the file doesn't exists; create a new one. We use this to create new text files in the web interface 2013-07-22 09:15:19 +02:00
Jenkins for ownCloud 01f3f8e0cc [tx-robot] updated from transifex 2013-07-22 02:03:23 -04:00
Bart Visscher 37a731bcad Merge pull request #4131 from owncloud/scanner-split
Remove scanner logic from ajax file and place it in it's own class
2013-07-21 11:32:11 -07:00
Bart Visscher 639097db59 Merge pull request #4092 from owncloud/base-better-errors
Generate better errors in base.php
2013-07-21 11:20:30 -07:00
Bart Visscher 9bf12da750 Merge pull request #3880 from owncloud/code-checker
Add classes replaced by the public api to the code checker
2013-07-21 11:19:20 -07:00
kondou 05084e03a0 Use !== and === in settings. 2013-07-21 13:55:25 +02:00
icewind1991 94fcbc736e Merge pull request #4145 from owncloud/fix-failing-master
Fix failing master
2013-07-21 04:31:27 -07:00
Morris Jobke f54f203e56 mark test as incomplete because I can't reproduce jenkins failure 2013-07-21 11:28:06 +02:00
Morris Jobke 8f93490ac4 fix failing master branch - Test_Config::testWriteData 2013-07-21 11:13:29 +02:00
Morris Jobke 05c83a163a add proper deprecated tag 2013-07-21 10:30:00 +02:00
Morris Jobke 647e0a0cba Merge pull request #4118 from owncloud/remove-size-experiment
finally remove the file size obfuscation as it had more disadvantages.
2013-07-21 01:25:39 -07:00
Jenkins for ownCloud 9a13b687cc [tx-robot] updated from transifex 2013-07-21 02:02:41 -04:00
Morris Jobke d0b6689c62 Merge pull request #4130 from owncloud/ie-show-password
deactivate show password toggle for IE
2013-07-20 05:22:37 -07:00
Jenkins for ownCloud fb6283537f [tx-robot] updated from transifex 2013-07-20 02:02:50 -04:00
Jan-Christoph Borchardt 48267b6e6c add back public API function, but mark as deprecated 2013-07-20 01:15:12 +02:00
Thomas Müller ae9b60ba61 Merge pull request #4119 from owncloud/external-storage-status
replace external storage status images with CSS, also use form to distinguish
2013-07-19 13:54:19 -07:00
Arthur Schiwon f6d133955e LDAP: fix background job, resolves #3528 2013-07-19 18:41:29 +02:00
Bart Visscher 11f28d7880 Result of && if not the part 2013-07-19 17:37:42 +02:00
Bart Visscher cbe1c22b5f Correct casing of OC_User and pass through the params to getUsers 2013-07-19 17:32:31 +02:00
Robin Appelman 2b89b7c880 Split scanning logic from ajax file 2013-07-19 16:44:47 +02:00
Robin Appelman b397df2022 add option to get the mountmanager from the filesystem 2013-07-19 16:33:00 +02:00
Robin Appelman 02cdd52fb0 Make Cache\Scanner an emitter 2013-07-19 16:32:43 +02:00
Jan-Christoph Borchardt 35fc149ef0 deactivate show password toggle for IE 2013-07-19 15:17:28 +02:00
Thomas Müller 20ee9945d1 don't rely on admin user but create a test user for Test_Encryption_Keymanager 2013-07-19 14:54:10 +02:00
Arthur Schiwon a8dfee04b8 Add message about completed update 2013-07-19 14:39:47 +02:00
Arthur Schiwon 2656ac9eeb non-ajax Upgrade script utility, usable via CLI or wget. Requires PR 4047. 2013-07-19 14:39:38 +02:00
Bart Visscher a22940d3cd Add OC_L10N to public api 2013-07-19 11:40:11 +02:00
Bart Visscher 9379cbf602 Add OC_Image to public api 2013-07-19 11:23:47 +02:00