Commit graph

2335 commits

Author SHA1 Message Date
Jenkins for ownCloud
d86a368e54 [tx-robot] updated from transifex 2012-11-16 00:03:47 +01:00
Thomas Müller
36bf4e24f0 Merge pull request #433 from owncloud/user_setting_fixes
User setting fixes
2012-11-15 14:01:16 -08:00
Bart Visscher
9419913c06 Better place to check for user removal 2012-11-15 18:10:40 +01:00
Arthur Schiwon
fd060d4849 really check if mod_deflate is loaded 2012-11-15 10:35:53 +01:00
Arthur Schiwon
64a8a0c872 coding style 2012-11-15 10:35:44 +01:00
Arthur Schiwon
4a75c539ed Fix remote.php CSS+JS garbish on some systems 2012-11-15 10:35:34 +01:00
Jenkins for ownCloud
a418a3ba65 [tx-robot] updated from transifex 2012-11-15 00:03:50 +01:00
Bart Visscher
343e9d8621 Better check and handing of user deletion 2012-11-14 21:52:28 +01:00
Bart Visscher
59627367ae Better check and handling of user creation 2012-11-14 21:52:28 +01:00
Lukas Reschke
8b03b683df Merge pull request #271 from owncloud/239_webdav_999_files
fixes #239 - query the database in chunks of 200
2012-11-14 10:53:00 -08:00
Alessandro Cosentino
7d01342bab fix translation issues with previous commit 2012-11-13 19:32:26 -05:00
Alessandro Cosentino
aa917cfb18 uncomment hours entries in relative date functions 2012-11-13 19:18:26 -05:00
Thomas Tanghus
bfb6faa850 Bump version to trigger update. 2012-11-13 12:11:18 +01:00
Thomas Tanghus
268a48479d Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-12 23:36:59 +01:00
Thomas Tanghus
d809efc1e5 Change insertIfNotExist() for sqlite. Not fast, but more reliable than previous attempt. 2012-11-12 23:34:02 +01:00
Bart Visscher
7b53c9d3f0 Merge pull request #157 from owncloud/setup
Make lib/setup.php usable outside of install setup
2012-11-12 13:23:31 -08:00
Thomas Tanghus
42b871dcf1 Correct SQL syntax. 2012-11-12 18:45:56 +01:00
blizzz
e0fdb8272b Merge pull request #371 from butonic/sql_and_error_log_fixes
add missing sql backticks, check sharing for error and add log
2012-11-12 03:37:43 -08:00
Jörn Friedrich Dreyer
ba91f9a237 add missing sql backticks, check sharing for error and add log 2012-11-12 12:04:46 +01:00
Thomas Tanghus
82e010c51c Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-12 00:37:40 +01:00
Thomas Tanghus
56239df2e7 Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_* 2012-11-11 23:10:23 +01:00
Thomas Tanghus
7f0c69eb0e Added CRUDS permissions to the OCP namespace. Implements issue #345 2012-11-11 23:09:54 +01:00
Thomas Tanghus
fd709fc021 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-11 20:20:09 +01:00
Diederik de Haas
f6daddadf5 Fixed new checkstyle issues in util.php from build #1341. 2012-11-10 00:58:03 +01:00
Diederik de Haas
20541c610e Fixed new checkstyle issues in migrate.php from build #1341. 2012-11-10 00:53:28 +01:00
Jenkins for ownCloud
7ec0efe5c2 [tx-robot] updated from transifex 2012-11-10 00:02:29 +01:00
Thomas Müller
6dbdc16287 Merge pull request #340 from butonic/fix_quota_zero_cornercase
fix quota off by one error
2012-11-09 05:54:50 -08:00
Jörn Friedrich Dreyer
c5ba4f476a fix quota off by one error 2012-11-09 14:34:15 +01:00
Stefan Seidel
8f669880bc Fix WebDAV (and Android Client) not being able to authorize on Debian Squeeze + mod_fcgid installs. 2012-11-09 13:30:07 +01:00
Thomas Müller
c053863644 Merge pull request #330 from owncloud/check_connection
add a check and a warning if the ownCloud server is not able to establis...
2012-11-09 02:11:24 -08:00
Jenkins for ownCloud
cb57a20ec2 [tx-robot] updated from transifex 2012-11-09 00:03:49 +01:00
Frank Karlitschek
55f75c6d8e add a check and a warning if the ownClodu server is not able to establish http connections to the internet. The reason is that users complained that external filesystem support, the update checker, downloading of new apps or the nowledgebase don´t work and don´t know why. 2012-11-08 18:08:44 +01:00
Tom Needham
8396c0478e Migration: Allow for no app data cases; handle file copying better 2012-11-08 11:37:27 +00:00
Tom Needham
0833be9d4e Migration: On import of user accounts only import folders in home dir, use OC_Helper::copyr
Check files when copying recursivley

Remove obsolete method

Dont count '.' and '..' as directories when importing.
2012-11-08 11:37:27 +00:00
Robin Appelman
ae74c54d65 normalize filepaths in OC_Files::getFileInfo 2012-11-07 22:54:10 +01:00
Björn Schießle
250f40fe40 check if $path is a empty string 2012-11-07 17:35:07 +01:00
icewind1991
5cad2d7ccc Merge pull request #307 from owncloud/etag-function-overwrite
Allow apps to change the way etags are generated
2012-11-07 08:02:59 -08:00
Björn Schießle
311b04f609 backport from approved patch in stable45:
make root the default parameter for getAbsolutePath()
2012-11-07 16:54:42 +01:00
Thomas Tanghus
972ba89bc2 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-07 15:33:21 +01:00
Brice Maron
ba62d8dea7 Fix quoting problem in fs mount. give Big DB error at least in PG 2012-11-07 15:27:34 +01:00
Robin Appelman
99aa972a40 Allow changing the way etags are generated 2012-11-07 14:21:34 +01:00
Robin Appelman
012a907a8a fix user specific mount configuration 2012-11-07 14:05:45 +01:00
Thomas Mueller
07ffa0de39 adding comments to explain what's going on here 2012-11-06 13:55:30 +01:00
Michael Gapczynski
3d13c9db70 Return empty array if file does not exist inside Shared folder, fixes issue #91 2012-11-05 17:54:23 -05:00
Thomas Mueller
415ec58422 fixes #329: query the database in chunks of 200 2012-11-05 22:42:03 +01:00
Thomas Tanghus
a50f98606d Check DB result. 2012-11-05 16:24:16 +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
Felix Moeller
a4b2ea586d Style: Remove all the dangling white spaces 2012-11-04 22:16:04 +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
27ab0357ae Checkstyle: Fix last six NewlineBeforeOpenBrace 2012-11-04 18:36:16 +01:00