Thomas Tanghus
|
7a29137e2b
|
Merge branch 'master' of github.com:owncloud/core into vcategories_db
|
2012-11-05 16:17:57 +01:00 |
Thomas Müller
|
5c72d28ffd
|
Merge pull request #245 from owncloud/fileactions
some more reuse for fileactions
|
2012-11-05 05:52:52 -08:00 |
Frank Karlitschek
|
59381b90a0
|
Merge pull request #252 from owncloud/fix_user_webdavauth
Fix user webdavauth
|
2012-11-05 05:38:06 -08:00 |
|
Frank Karlitschek
|
6fba4ba87d
|
fix the webdavauth app
|
2012-11-05 14:22:16 +01:00 |
Robin Appelman
|
34fee8afaa
|
remove debug statements
|
2012-11-05 13:52:02 +01:00 |
|
Thomas Tanghus
|
1147dc9774
|
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
lib/vcategories.php
|
2012-11-05 12:06:59 +01:00 |
|
Frank Karlitschek
|
01b0e9b133
|
fix the webdav user backend. still not completel working but a frist step
|
2012-11-05 10:46:28 +01:00 |
|
Thomas Müller
|
135680e50b
|
Merge pull request #242 from fmms/checkstyle05
Checkstyle fixes
|
2012-11-05 01:34:11 -08:00 |
|
Jenkins for ownCloud
|
f0be09a23c
|
[tx-robot] updated from transifex
|
2012-11-05 00:03:41 +01:00 |
|
Frank Karlitschek
|
d9d6dc892c
|
add a link to the contribution guidelines to make it easier for new people
|
2012-11-04 23:40:37 +01:00 |
Felix Moeller
|
02ec677e3c
|
Style: The last two spaces
|
2012-11-04 22:57:40 +01:00 |
|
Felix Moeller
|
a4b2ea586d
|
Style: Remove all the dangling white spaces
|
2012-11-04 22:16:04 +01:00 |
|
Robin Appelman
|
4f32f49fb1
|
this line shouldn't be here
|
2012-11-04 21:00:36 +01:00 |
|
Robin Appelman
|
f187aa6c93
|
some more code reuse for fileactions
also fixes an issue where some fileactions always worked on the last file in the list
|
2012-11-04 20:48:38 +01:00 |
Lukas Reschke
|
555dd5c261
|
Merge pull request #200 from owncloud/ldap
LDAP: clear the cache not only when TTL changes, but with every settings...
|
2012-11-04 11:03:18 -08:00 |
Arthur Schiwon
|
00bb246a0d
|
merge from master
|
2012-11-04 19:58:48 +01:00 |
|
Felix Moeller
|
1e33ad9cbc
|
Style: Different line endings in one file are bad for sure
I think Checkstyle did not find this occurence, however consistant line endings are preferred.
@DeepDiver can Checkstyle find this?
|
2012-11-04 19:11:53 +01:00 |
|
Felix Moeller
|
9795bc19bf
|
Checkstyle: Fix the last two InvalidEOLChar
|
2012-11-04 18:42:18 +01:00 |
|
Felix Moeller
|
27ab0357ae
|
Checkstyle: Fix last six NewlineBeforeOpenBrace
|
2012-11-04 18:36:16 +01:00 |
|
Felix Moeller
|
bc4382c5c5
|
Checkstyle: fix the last NoSpaceAfterEquals
|
2012-11-04 18:31:44 +01:00 |
|
Felix Moeller
|
0e70ea9d8b
|
Checkstyle: Fix the last 25 NoSpaceAfterComma
|
2012-11-04 18:28:29 +01:00 |
|
Felix Moeller
|
1205749f8c
|
Checkstyle: Fix the last two SpaceBeforeOpenBrace
|
2012-11-04 18:18:03 +01:00 |
|
Thomas Müller
|
8ac3849a95
|
Merge pull request #238 from fmms/checkstyle04
Checkstyle fixes
|
2012-11-04 08:59:45 -08:00 |
|
Lukas Reschke
|
8c4c74b23f
|
Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession
Just one CSRF token per session
|
2012-11-04 05:54:02 -08:00 |
|
Lukas Reschke
|
80b9854710
|
Remove uneeded debug output
|
2012-11-04 14:26:45 +01:00 |
|
Thomas Tanghus
|
88b91a7304
|
Swap expected and actual.
|
2012-11-04 12:33:32 +01:00 |
|
Thomas Tanghus
|
e6a7bba095
|
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
lib/vcategories.php
|
2012-11-04 12:31:06 +01:00 |
|
Thomas Tanghus
|
8e5b6bf21d
|
VCategories: Make $categories non-static again.
|
2012-11-04 12:24:49 +01:00 |
|
Thomas Tanghus
|
7c67d2fdd6
|
VCategories: Swap expected and actual in unit tests.
|
2012-11-04 12:09:54 +01:00 |
|
Thomas Tanghus
|
4648dcfa46
|
VCategories: Use correct variable.
|
2012-11-04 12:09:04 +01:00 |
|
Felix Moeller
|
30d7993e01
|
Checkstyle fixes: NoSpaceAfterComma
|
2012-11-04 11:10:46 +01:00 |
|
Felix Moeller
|
f8d1d7787e
|
Checkstyle fixes for SpaceBeforeOpenBrace
|
2012-11-04 10:46:32 +01:00 |
|
Jenkins for ownCloud
|
17d466b03b
|
[tx-robot] updated from transifex
|
2012-11-04 00:01:42 +01:00 |
|
Robin Appelman
|
4c0c78d15d
|
check for filename blacklist in OC_Filesystem::isValidPath
|
2012-11-03 00:26:36 +01:00 |
|
Robin Appelman
|
503922ff6c
|
some tests for the file blacklist
|
2012-11-03 00:26:36 +01:00 |
|
Jenkins for ownCloud
|
2f0fd84477
|
[tx-robot] updated from transifex
|
2012-11-03 00:02:24 +01:00 |
|
Lukas Reschke
|
fd584f446d
|
Merge pull request #220 from fmms/checkstyle02
Checkstyle: many fixes
|
2012-11-02 14:59:36 -07:00 |
|
Robin Appelman
|
2dbf2c69de
|
fix inlude path for template test
|
2012-11-02 21:46:27 +01:00 |
|
Robin Appelman
|
a1c37d4be5
|
fix OC_Filesystem::isValidPath when using \ instead of / in paths
|
2012-11-02 19:56:34 +01:00 |
|
Felix Moeller
|
afadf93d31
|
Checkstyle: many fixes
|
2012-11-02 19:53:02 +01:00 |
|
Arthur Schiwon
|
df8c67721d
|
code style
|
2012-11-02 09:42:10 +01:00 |
|
Lukas Reschke
|
d9e9761099
|
Fix a typo
|
2012-11-02 00:16:40 +01:00 |
|
Lukas Reschke
|
0f02b7dea6
|
Add CSRF token
|
2012-11-02 00:09:28 +01:00 |
|
Jenkins for ownCloud
|
627509875e
|
[tx-robot] updated from transifex
|
2012-11-02 00:04:59 +01:00 |
|
Lukas Reschke
|
5db2f42189
|
Merge pull request #203 from owncloud/wording-url-link
Files: change wording 'From url' to 'From link'
|
2012-11-01 10:45:17 -07:00 |
Jan-Christoph Borchardt
|
e66482430e
|
Files: change wording 'From url' to 'From link'
|
2012-11-01 18:09:16 +01:00 |
|
Arthur Schiwon
|
5252fc52ed
|
LDAP: clear the cache not only when TTL changes, but with every settings update. Fixes #194
|
2012-11-01 16:48:17 +01:00 |
|
Robin Appelman
|
553b1072b6
|
fix archive tar include path
|
2012-11-01 16:15:25 +01:00 |
|
Thomas Tanghus
|
b0ae67d5c5
|
Update vcategories ajax scripts.
|
2012-11-01 03:06:20 +01:00 |
|
Thomas Tanghus
|
290d0714df
|
Add routes for vcategory favorites.
|
2012-11-01 03:05:48 +01:00 |