Commit graph

7282 commits

Author SHA1 Message Date
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
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
Thomas Müller
59c2414439 Fixing typo 2012-10-18 23:27:49 +03:00
Thomas Müller
a707fd639d Fixing expectation - comma was stupid anyhow 2012-10-18 22:22:41 +03:00
Thomas Müller
e417ad6b16 Removing strange character 2012-10-18 22:11:41 +03:00
Arthur Schiwon
81cf726b18 unset UserID after Update 2012-10-18 18:45:03 +02:00
Lukas Reschke
3fc9fbeef7 Expectation should be first parameter 2012-10-18 18:35:19 +03:00
Lukas Reschke
665100b471 Expectation should be first parameter 2012-10-18 18:34:24 +03:00
Björn Schießle
08ee2fcf93 check if mount point was already loaded to avoid redundant read operations 2012-10-18 17:30:01 +02:00
Björn Schießle
65b0824d35 typo from previous commit fixed 2012-10-18 17:15:30 +02:00
Björn Schießle
2499c24b8b load system wide configured mount points before accessing shared files 2012-10-18 17:15:30 +02:00
Björn Schießle
00ed2e87c9 check for mount points if file was shared from a different user 2012-10-18 17:15:30 +02:00
Thomas Müller
e4c0bb59e5 Merge pull request #39 from scambra/date-l10n-fixes
Date l10n fixes
2012-10-18 08:09:58 -07:00
Jörn Friedrich Dreyer
e307bf31c8 fix oc-605 2012-10-18 14:19:34 +02:00
Jörn Friedrich Dreyer
a7d8519550 when using oracle use LOWER() to make searching files case insensitive 2012-10-18 14:19:34 +02:00
Jenkins for ownCloud
519a0ae4ab [tx-robot] updated from transifex 2012-10-18 02:09:32 +02:00
Thomas Tanghus
72f2f53e24 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-17 22:36:58 +02:00
Thomas Müller
9f01cd05fb Merge pull request #37 from scambra/js-interpolation-l10n
use interpolation for some translations in js
2012-10-17 13:28:46 -07:00
Thomas Tanghus
26e92094a6 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-17 12:30:14 +02:00
Bart Visscher
04824162d9 core.js and core.css don't need to be absolute 2012-10-17 10:52:16 +02:00
Jenkins for ownCloud
d5e91216b5 [tx-robot] updated from transifex 2012-10-17 02:05:23 +02:00
Thomas Tanghus
8cd268fc82 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-17 00:16:37 +02:00
Thomas Mueller
1c3a36a079 From now on we support two german translation: formal and personal 2012-10-16 23:40:14 +02:00
Jenkins for ownCloud
fd6adc7d08 [tx-robot] updated from transifex 2012-10-16 23:39:13 +02:00
Thomas Mueller
45dec77d92 remove apps translations - they live in owncloud/apps now 2012-10-16 22:42:39 +02:00
Michael Gapczynski
c00f5d164f Fix unshareAll() 2012-10-16 16:27:23 -04:00