Commit Graph

7801 Commits

Author SHA1 Message Date
Thomas Tanghus befdd6b63b Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-23 06:23:03 +02:00
Jenkins for ownCloud bc2a648f2d [tx-robot] updated from transifex 2012-10-23 02:06:03 +02:00
Felix Moeller 6a00a6b9ed Make Jenkins more happy.
This is NoSpaceAfterComma
2012-10-23 00:28:12 +02:00
Arthur Schiwon 78a1b987bb LDAP: fix db update for Postgres 2012-10-23 00:18:43 +02:00
Lukas Reschke 65619af05b Disable enhancedauth by default
Admins can still enable it via config.php
2012-10-22 23:04:39 +02:00
Arthur Schiwon b879cd709e LDAP: fix cache save and check, fixes oc-2118 2012-10-22 22:46:28 +02:00
Felix Moeller 03581ef463 Correct a first issue Checkstyle is complaining about ...
This is BracketsNotRequired
2012-10-22 21:40:33 +02:00
Felix Moeller 37296b8b6d Adding the t() function to have the labels in the search results translated
This should solve #55
2012-10-22 20:55:05 +02:00
Thomas Müller 126d16f16d Fixing undefined $language 2012-10-22 17:09:34 +03:00
Thomas Tanghus 69cf89c5f6 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-22 15:41:39 +02:00
Thomas Tanghus b5817dcc2e Added missing backtick to sql query. 2012-10-22 15:41:00 +02:00
Thomas Tanghus 273fdb7b64 Added type and callback arguments to most methods. 2012-10-22 15:40:08 +02:00
Björn Schießle d68b89cae4 add parameter to specify user for which OC_Filesystem should be initialized.
(needed to share files via public links where no user is logged in)
2012-10-22 14:55:53 +02:00
Jenkins for ownCloud d8e945466d [tx-robot] updated from transifex 2012-10-22 02:06:18 +02:00
Jenkins for ownCloud 16c4eb66d7 [tx-robot] updated from transifex 2012-10-21 02:06:44 +02:00
Bart Visscher 051dde08db Check for file exists before loading app version file 2012-10-20 23:49:55 +02:00
Michael Gapczynski 699a484f42 Fix font family for textarea 2012-10-20 14:15:33 -04:00
Michael Gapczynski dd58849aa0 Apply textbox CSS rules to textarea as well 2012-10-20 14:11:35 -04:00
Thomas Tanghus 26618704a9 Fix accidentally creating new categories with the id as name. 2012-10-20 13:45:18 +02:00
Thomas Tanghus ab167c3e2c Filter out special Favorites category. 2012-10-20 13:42:57 +02:00
Jenkins for ownCloud cfbd310d34 [tx-robot] updated from transifex 2012-10-20 02:03:53 +02:00
Thomas Tanghus fc6d1bf500 Clean indentation. 2012-10-19 19:42:59 +02:00
Thomas Tanghus 2456401672 Remove redundant class wrapping. 2012-10-19 18:11:13 +02:00
Thomas Tanghus 73c743076e Remove index that might cause problems. 2012-10-19 17:23:54 +02:00
Thomas Tanghus 10e29da8be Use self::prepare() instead of self::$connection->prepare. 2012-10-19 17:21:23 +02:00
Thomas Tanghus 394e4e4d5f Removed useless ORDER BY from query. 2012-10-19 16:15:47 +02:00
scambra 41b597e179 Translate formatDate using jquery datepicker 2012-10-19 13:56:19 +02:00
scambra a24d8db4b2 translate datepicker 2012-10-19 13:56:19 +02:00
Thomas Tanghus 2ea4fed448 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-19 13:22:27 +02:00
Thomas Tanghus 1803260285 Renamed OC_VCategories::add() to addMulti() and let the add() method return the id of the newly created category. 2012-10-19 13:21:05 +02:00
Thomas Tanghus 0e4ed2887c Return result from OC_DB::insertIfNotExist(). 2012-10-19 13:20:08 +02:00
Thomas Tanghus 1c9929d44f Added unit tests for OC_DB::insertIfNotExist() 2012-10-19 13:18:57 +02:00
Thomas Müller 8a03abec0d Filter added to get all files into coderage report 2012-10-19 10:45:51 +03:00
Thomas Tanghus 03ff614265 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-19 02:27:04 +02:00
Thomas Tanghus afa3f49c93 Make categories var static. 2012-10-19 02:26:36 +02:00
Thomas Tanghus fdf3ec1027 Add wait state to category dialog while processing. 2012-10-19 02:25:39 +02:00
Thomas Tanghus e55cc23132 app !== type 2012-10-19 02:24:57 +02:00
Jenkins for ownCloud f5043c0661 [tx-robot] updated from transifex 2012-10-19 02:08:00 +02:00
Thomas Tanghus 81536a81e3 More js updates for app/type in OCCategories 2012-10-19 00:39:09 +02:00
Thomas Tanghus b9c9fdfe20 Use get for loading dialog. 2012-10-19 00:38:23 +02:00
Thomas Tanghus 4827de4a27 White space fix. 2012-10-19 00:20:27 +02:00
Thomas Tanghus 3b6cfe4977 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-19 00:17:28 +02:00
Thomas Tanghus 8a777022e4 Formatting 2012-10-19 00:16:53 +02:00
Thomas Tanghus 09e26145b7 Add favorite handling methods to OC_VCategories. 2012-10-19 00:15:58 +02:00
Thomas Tanghus 1f7baeb974 Use consts all places and rename some daft method names. 2012-10-19 00:13:34 +02:00
Thomas Tanghus 97c884c548 Updated category js for handling favorites and use post instead of get. 2012-10-19 00:09:07 +02:00
Thomas Tanghus 26719005a4 Added ajax files for favorite category handling. 2012-10-19 00:07:41 +02:00
Thomas Tanghus f4fd4a5a52 Updated category ajax files to use type instead of app and add callCheck. 2012-10-19 00:06:18 +02:00
Thomas Mueller c8d436c43d cleanup report folder 2012-10-18 23:36:03 +02:00
Thomas Mueller 7be661872f adding coverage html 2012-10-18 23:29:49 +02:00