Thomas Tanghus
|
2fc495a91a
|
Also delete category/object relations when deleting a category.
|
2012-10-24 22:39:34 +02:00 |
|
Thomas Tanghus
|
675a56c5ed
|
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
lib/vcategories.php
|
2012-10-24 21:55:25 +02:00 |
Lukas Reschke
|
515e1b467e
|
Merge pull request #81 from fmms/master
Codestyle add some needed spaces.
|
2012-10-24 10:16:32 -07:00 |
Björn Schießle
|
0c2a4264c9
|
normalize path
|
2012-10-24 17:39:39 +02:00 |
|
Lukas Reschke
|
a7eb56c799
|
Merge pull request #76 from fmms/master
checkstyle: some more cleanups
|
2012-10-23 23:48:27 -07:00 |
|
Lukas Reschke
|
f112d8cd69
|
Merge pull request #75 from fmms/master
More Checkstyle cleanup
|
2012-10-23 15:07:14 -07:00 |
Felix Moeller
|
561cbb2de6
|
NoSpaceAfterComma II
|
2012-10-23 23:01:10 +02:00 |
|
Felix Moeller
|
e73b817a38
|
Checkstyle: NoSpaceAfterComma
|
2012-10-23 22:53:54 +02:00 |
|
Lukas Reschke
|
73f85c3b81
|
Merge pull request #62 from fmms/master
More Checkstyle warnings
|
2012-10-23 08:07:01 -07:00 |
|
Lukas Reschke
|
d18ea0e76c
|
Merge pull request #40 from scambra/dateformat-fixes
Dateformat fixes
|
2012-10-23 08:06:28 -07:00 |
Robin Appelman
|
7fdbce6ac1
|
use strtotime on non-nummeric times in oc_filesystem::touch
|
2012-10-23 16:36:09 +02:00 |
scambra
|
9601352d46
|
fix strftime in windows, use %#d instead of %e in windows
|
2012-10-23 16:24:54 +02:00 |
icewind1991
|
ab944094e2
|
Merge pull request #12 from scambra/fixes
check free space using folder's owner
|
2012-10-23 07:02:21 -07:00 |
|
icewind1991
|
fbe059afd3
|
Merge pull request #59 from fmms/master
Starting point to take care of Checkstyle warnings
|
2012-10-23 06:58:15 -07:00 |
|
Lukas Reschke
|
726409b272
|
Merge pull request #58 from fmms/master
Translate headings in search results (fixes #55)
|
2012-10-23 04:43:25 -07:00 |
Arthur Schiwon
|
b43b85c849
|
get effective username after webdav login, fixes oc-2108
|
2012-10-23 13:38:46 +02:00 |
|
Lukas Reschke
|
b66dd3ebef
|
Merge pull request #38 from scambra/datepicker-l10n
Translate Datepicker
|
2012-10-22 23:53:24 -07:00 |
|
Felix Moeller
|
36d0d75901
|
Codestyle: FunctionCallArgumentSpacing
|
2012-10-23 08:35:54 +02:00 |
|
Felix Moeller
|
ff5f9370c4
|
Checkstyle: MultiLineCondition
|
2012-10-23 08:25:30 +02:00 |
|
Felix Moeller
|
ddfcc96ab5
|
Checkstyle: LowerCaseConstant
|
2012-10-23 08:20:17 +02:00 |
|
Felix Moeller
|
2d61f03452
|
More Checkstyle cleanup
This is for all LowerCaseConstant warnings
|
2012-10-23 08:01:09 +02:00 |
|
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 |
|
Lukas Reschke
|
65619af05b
|
Disable enhancedauth by default
Admins can still enable it via config.php
|
2012-10-22 23:04:39 +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 |
|
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 |
Bart Visscher
|
051dde08db
|
Check for file exists before loading app version file
|
2012-10-20 23:49:55 +02: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
|
2456401672
|
Remove redundant class wrapping.
|
2012-10-19 18:11:13 +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
|
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
|
afa3f49c93
|
Make categories var static.
|
2012-10-19 02:26:36 +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 |
|
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 |