Robin Appelman
|
03fd43a239
|
Merge branch 'master' into filesystem
|
2012-11-25 15:38:17 +01:00 |
|
Thomas Müller
|
f81321af3d
|
Merge pull request #556 from owncloud/postgres_insert_id
use lastval() to get the insert id in postgesql
|
2012-11-24 22:55:33 -08:00 |
|
Michael Gapczynski
|
cc5d8e5609
|
Check if data variable in scanner isn't null before using it
|
2012-11-24 20:29:57 -05:00 |
|
Robin Appelman
|
709aacfa0f
|
change behaviour of Filesystem::getMountPoint when a mountpoint is passed as path without trailing slash
|
2012-11-24 23:41:39 +01:00 |
|
Robin Appelman
|
d3e37fa157
|
remove fileatime from common storage backend
|
2012-11-24 22:55:26 +01:00 |
|
Michael Gapczynski
|
c47bf9bbce
|
Add checks for storage object
|
2012-11-24 16:42:54 -05:00 |
|
Frank Karlitschek
|
e450933650
|
remove left over tag
|
2012-11-24 18:25:05 +01:00 |
|
Frank Karlitschek
|
0f61816278
|
A new function to create nice error page. And use it for fatal db errors
|
2012-11-24 18:07:26 +01:00 |
|
Frank Karlitschek
|
fb5d0db037
|
prettier error output. Let´s see how many more low hanging fruits I find on my way to the real bug that I want to fix ;-)
|
2012-11-23 16:40:28 +01:00 |
|
Jörn Friedrich Dreyer
|
995b5c0739
|
readd fallback code for pre token links
|
2012-11-23 15:51:57 +01:00 |
|
Robin Appelman
|
95057e727d
|
merge master into filesystem
|
2012-11-23 00:40:58 +01:00 |
|
Robin Appelman
|
95340a9e67
|
use lastval() to get the insert id in postgesql
|
2012-11-23 00:23:27 +01:00 |
|
Robin Appelman
|
ad706229f5
|
explicitly sort files when using getFolderContents
|
2012-11-23 00:17:18 +01:00 |
|
Jenkins for ownCloud
|
3688376a6f
|
[tx-robot] updated from transifex
|
2012-11-23 00:03:17 +01:00 |
|
Frank Karlitschek
|
6cb3774706
|
make it possible to manually override the hostname and protocol if the automatic detection from ownCloud fails. This can happen in reverse proxy situations or with loadbalancers setups.
|
2012-11-22 19:22:00 +01:00 |
|
Robin Appelman
|
810563ae8a
|
don't redefine inherited functions as abstract
|
2012-11-22 12:45:29 +01:00 |
|
Robin Appelman
|
8687e0d346
|
add Scanner->backgroundScan
|
2012-11-22 12:45:29 +01:00 |
|
Robin Appelman
|
186c9e77e8
|
add Cache->getIncomplete for use in background scanning
|
2012-11-22 12:45:29 +01:00 |
|
Robin Appelman
|
e6cf082fe0
|
emit a hooks during the filesystem scan
|
2012-11-22 12:45:29 +01:00 |
|
Thomas Müller
|
54356636e4
|
Merge pull request #483 from owncloud/archive_sizes
stop increasing folder sizes once we hit a non folder
|
2012-11-22 01:56:08 -08:00 |
|
Thomas Mueller
|
208c6fd966
|
fixing namespace
|
2012-11-22 10:21:48 +01:00 |
|
Michael Gapczynski
|
b76d1afe19
|
Create public function initMountPoints() for initializing a specified user's mount points
|
2012-11-22 00:44:48 -05:00 |
|
Michael Gapczynski
|
77fdb16b7c
|
Remove incorrect extra parameter for init() call
|
2012-11-22 00:23:11 -05:00 |
|
Jenkins for ownCloud
|
3a5f5e127c
|
[tx-robot] updated from transifex
|
2012-11-22 00:02:16 +01:00 |
|
Robin Appelman
|
97380f3485
|
merge master into filesystem
|
2012-11-21 22:37:14 +01:00 |
|
Thomas Müller
|
a85d891938
|
Merge pull request #538 from Deltachaos/fix_537
Fixes update of shared files with mirall because it dose not update all ...
|
2012-11-20 22:55:08 -08:00 |
|
Jenkins for ownCloud
|
9204be827b
|
[tx-robot] updated from transifex
|
2012-11-21 00:02:33 +01:00 |
|
Maximilian Ruta
|
ac4cafcfc7
|
Fixes update of shared files with mirall because it dose not update all methadata for a file
|
2012-11-20 23:34:25 +01:00 |
|
Jörn Friedrich Dreyer
|
d8a171df26
|
implement share via link token
|
2012-11-20 15:03:12 +01:00 |
|
Jenkins for ownCloud
|
568def2b61
|
[tx-robot] updated from transifex
|
2012-11-20 00:02:08 +01:00 |
|
Brice Maron
|
8fa7d6a48a
|
Fix typo in getUrlContent fix #514
|
2012-11-19 17:13:07 +00:00 |
|
Thomas Müller
|
d91c841f73
|
Merge pull request #383 from owncloud/contacts_api
Proposal for a public contacts api
|
2012-11-19 05:42:01 -08:00 |
|
Frank Karlitschek
|
5b2aeebaf0
|
Merge pull request #280 from butonic/feature_bmp_support
add bmp support
|
2012-11-19 00:53:46 -08:00 |
|
Jenkins for ownCloud
|
c5e891008b
|
[tx-robot] updated from transifex
|
2012-11-19 00:01:48 +01:00 |
|
Robin Appelman
|
40fae0acbf
|
fix outdated permissions cache use in scanner
|
2012-11-18 14:10:28 +01:00 |
|
Robin Appelman
|
a922eb756e
|
merge master into filesystem
|
2012-11-18 14:07:52 +01:00 |
|
Thomas Müller
|
ea80a8b9e3
|
Merge pull request #114 from riso/xsendfile
Implement X-Sendfile support
|
2012-11-18 04:35:46 -08:00 |
|
Jenkins for ownCloud
|
e28d71bf55
|
[tx-robot] updated from transifex
|
2012-11-18 00:02:00 +01:00 |
|
Brice Maron
|
4337e0fb99
|
Little case fix
|
2012-11-17 22:12:24 +00:00 |
|
Brice Maron
|
71adad8817
|
Add User agent when OC does a request
|
2012-11-17 21:08:58 +00:00 |
|
Thomas Müller
|
ac3e962732
|
Merge pull request #375 from tdevos/master
Use curl to get remote file content
|
2012-11-17 12:31:25 -08:00 |
|
Jenkins for ownCloud
|
61670184c4
|
[tx-robot] updated from transifex
|
2012-11-17 00:02:24 +01:00 |
|
Robin Appelman
|
1007013833
|
stop increasing folder sizes once we hit a non folder
fixes #234
|
2012-11-16 17:54:58 +01:00 |
|
Robin Appelman
|
8fe69dfac6
|
also return fileid in OC_Filecache::get
|
2012-11-16 17:52:52 +01:00 |
|
Robin Appelman
|
74611801dd
|
typo
|
2012-11-16 17:41:38 +01:00 |
|
Robin Appelman
|
f4f00b4edb
|
Merge branch 'master' into filesystem
|
2012-11-16 12:13:03 +01:00 |
|
Thomas Müller
|
d1c0f2a739
|
Merge pull request #454 from Raydiation/master
Routing fixes
|
2012-11-15 15:15:07 -08:00 |
|
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 |
|
Robin Appelman
|
288ecf318c
|
add getFileInfo and getDirectoryContent to OC_Files for compatibility
|
2012-11-15 22:08:08 +01:00 |
|
Robin Appelman
|
5569f07e8d
|
add OC_FilesystemView alias for compatibility
|
2012-11-15 22:04:48 +01:00 |
|
Robin Appelman
|
f94d62380f
|
Merge branch 'master' into filesystem
|
2012-11-15 21:27:24 +01:00 |
|
thomas
|
d2047a00cf
|
Remove parentheses in return, modify description, and fix a mistake
|
2012-11-15 20:46:17 +01:00 |
|
Bart Visscher
|
8bed38c78d
|
Rename install hook functions to register hook
|
2012-11-15 18:13:54 +01:00 |
|
Bart Visscher
|
9419913c06
|
Better place to check for user removal
|
2012-11-15 18:10:40 +01:00 |
|
Bernhard Posselt
|
e642d18e26
|
When using routing in apps, no apps are loaded in the left navigation tree. To fix this: load apps for matching a request
|
2012-11-15 14:48:18 +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 |
|
Robin Appelman
|
cbcd9ba84a
|
allow storage backends to implement custom permission management
|
2012-11-15 00:57:30 +01:00 |
|
Robin Appelman
|
bf2ac9f113
|
merge master into filesystem
|
2012-11-15 00:37:54 +01:00 |
|
Jenkins for ownCloud
|
a418a3ba65
|
[tx-robot] updated from transifex
|
2012-11-15 00:03:50 +01:00 |
|
thomas
|
40dd5ae61c
|
change and transfert getUrlContent
|
2012-11-14 23:14:04 +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 |
|
Valerio Ponte
|
de7e419610
|
Fixed style according to owncloud styleguide
|
2012-11-14 20:10:20 +01:00 |
|
Valerio Ponte
|
8e190a5a97
|
Moved X-Sendfile headers into OC_Files::get
now should work with temp files too
|
2012-11-14 20:10:20 +01:00 |
|
Valerio Ponte
|
8420b9bf67
|
Implemented X-Sendfile support
|
2012-11-14 20:10:20 +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 |
|
Bart Visscher
|
530f3f8be9
|
Create functions to install standard hooks
Also use these in tests that needs them
Fix #151
|
2012-11-13 23:45:17 +01:00 |
|
Thomas Mueller
|
33a4dfa087
|
function isEnabled() added
|
2012-11-13 20:59:47 +01: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 |
|
Thomas Mueller
|
c3825112a0
|
public contacts api as discussed here https://github.com/owncloud/apps/issues/113
|
2012-11-12 23:25:32 +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 |
|
thomas
|
847467ab00
|
Add connection time out option
|
2012-11-12 16:29:22 +01:00 |
|
thomas
|
4564898c28
|
Use curl to get remote file content
|
2012-11-12 15:37:44 +01:00 |
|
Jörn Friedrich Dreyer
|
0ce5e9257e
|
add php-doc for ellipsis
|
2012-11-12 14:04:23 +01:00 |
|
Jörn Friedrich Dreyer
|
28671d92c0
|
move code to better places
|
2012-11-12 13:56:29 +01:00 |
|
Jörn Friedrich Dreyer
|
bb56581192
|
add php-doc
|
2012-11-12 13:04:00 +01:00 |
|
Jörn Friedrich Dreyer
|
43bfabf68f
|
add bmp support
|
2012-11-12 13:04:00 +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 |
|
Robin Appelman
|
46071fed80
|
fix quota proxy
|
2012-11-08 21:35:40 +01:00 |
|
Robin Appelman
|
fedff3eafe
|
add cache updater
|
2012-11-08 21:12:40 +01:00 |
|
Robin Appelman
|
5a173b901f
|
fix Scanner->scan setting the filesize to 0 for files
|
2012-11-08 20:47:40 +01:00 |
|
Robin Appelman
|
15b8a3f987
|
move correctFolderSize from Scanner to Cache
|
2012-11-08 18:10:54 +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 |
|
Robin Appelman
|
3f644fe70c
|
fix calculateFolderSize for non existing files
|
2012-11-08 18:07:30 +01:00 |
|
Robin Appelman
|
e7bed5ddab
|
allow creating Cache objects with only the storage id instead of the whole storage object
|
2012-11-08 17:59:08 +01:00 |
|
Robin Appelman
|
706bb3ccd6
|
move ETag generation to storage backends
|
2012-11-08 17:48:26 +01:00 |
|
Robin Appelman
|
72c3868644
|
add resolvePath to filesystem view api
|
2012-11-08 17:42:26 +01:00 |
|
Robin Appelman
|
091ff02362
|
merge master into filesystem
|
2012-11-08 17:32:00 +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 |
|
Robin Appelman
|
961ff01a93
|
merge master into filesystem
|
2012-11-07 17:18:56 +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 |
|
Robin Appelman
|
4b940955dd
|
merge master into filesystem
|
2012-11-04 21:12:18 +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 |
|
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 |
|
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 |
|
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 |
|
Lukas Reschke
|
fd584f446d
|
Merge pull request #220 from fmms/checkstyle02
Checkstyle: many fixes
|
2012-11-02 14:59:36 -07:00 |
|
Robin Appelman
|
8a6bb7965d
|
add Cache::move
|
2012-11-02 22:25:33 +01:00 |
|
Robin Appelman
|
4a5a36577e
|
merge master into filesystem
|
2012-11-02 21:42:29 +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 |
|
Lukas Reschke
|
d2e842fcc9
|
Remove uneeded new line
|
2012-11-01 22:38:21 +01:00 |
|
Lukas Reschke
|
822e4d5f6c
|
Check for redirect_url for logged in users
This checks if there is a redirect_url for logged in users
|
2012-11-01 22:37:37 +01:00 |
|
Robin Appelman
|
51ba12890d
|
Merge branch 'master' into filesystem
|
2012-11-01 16:16:02 +01:00 |
|
Robin Appelman
|
553b1072b6
|
fix archive tar include path
|
2012-11-01 16:15:25 +01:00 |
|
Lukas Reschke
|
81f019b6c5
|
Make the redirect_url working again
Fixes #160
|
2012-10-31 22:03:55 +01:00 |
|