Commit Graph

12562 Commits

Author SHA1 Message Date
Bart Visscher 6d39e0ad6f Change to use !== and === 2013-07-21 21:42:42 +02:00
Thomas Müller 01c39cf2be fixing typos, PHPDoc and missing namespace \ 2013-07-21 21:42:42 +02:00
Bart Visscher 3de8570e35 Move basic template functions to their own class 2013-07-21 21:42:42 +02:00
Bart Visscher 2593395561 Move template functions to there own file 2013-07-21 21:37:25 +02:00
Bart Visscher 5965f3ecea Split locating JS and CSS files to their own class 2013-07-21 21:36:15 +02: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
Thomas Müller 7fac7fef03 pgsql support added 2013-07-19 10:49:30 +02:00
Thomas Müller 1257a3c948 parallel execution support for mysql added 2013-07-19 08:50:22 +02:00
Jenkins for ownCloud ae82f7fd17 [tx-robot] updated from transifex 2013-07-19 02:03:14 -04:00
Robin Appelman a945ce908b style fix 2013-07-19 02:23:57 +02:00
Andreas Fischer 2c38c2a70e Merge pull request #3947 from runky/patch-1
* runky/patch-1:
  Update authenticate.php
2013-07-19 02:19:14 +02:00
Thomas Müller fdfb224d97 Merge branch 'master' into parallel-autotest.sh-master 2013-07-18 23:28:06 +02:00
Bart Visscher 084cf0c202 Merge pull request #2221 from owncloud/doctrine
OC6: Implement Doctrine as the backend for OC_DB
2013-07-18 14:24:27 -07:00
Jan-Christoph Borchardt 100eb2b611 replace external storage status images with CSS, also use form to distinguish, fix #3910 2013-07-18 23:00:04 +02:00
Jan-Christoph Borchardt 48948ccf5f finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry. 2013-07-18 22:15:26 +02:00
Bart Visscher e2b6781cf9 Tweaks to the MDB2SchemaReader 2013-07-18 21:07:56 +02:00
Robin Appelman e3ea3ed3c5 group: only pass backends that hold that specific group to the group constructor 2013-07-18 12:15:34 +02:00
Jenkins for ownCloud 279a71acb3 [tx-robot] updated from transifex 2013-07-18 02:02:51 -04:00
Thomas Müller 3c6b205e37 Merge pull request #4099 from owncloud/fixing-unix-timestamp-mssql-master
fixing UNIX_TIMESTAMP() for mssql
2013-07-17 13:57:43 -07:00
Thomas Müller 93b9bad6bb Update build.xml 2013-07-17 15:25:41 +02:00
Markus Goetz 3fd4ff79ee Merge pull request #4042 from guruz/webdav_auth_check_existing
WebDAV Auth Connector: Check if already logged in
2013-07-17 05:00:59 -07:00
Markus Goetz bf7514f76a WebDAV Auth Connector: Check if already logged in 2013-07-17 13:51:15 +02:00
Thomas Mueller 24283425a6 fixing UNIX_TIMESTAMP() for mssql 2013-07-17 13:18:46 +02:00
Thomas Müller a3ff771567 Merge pull request #4067 from owncloud/fixing-tests-win32-master
<<<EOL seems not to use proper end of lines on windows
2013-07-17 00:37:02 -07:00
Jenkins for ownCloud 210006c4a6 [tx-robot] updated from transifex 2013-07-17 02:28:02 -04:00