Thomas Mueller
e65abb8054
minified version no longer available
2012-12-04 14:49:19 +01:00
Brice Maron
a310dcb0ff
Fix a dirty function preventing showing errors
2012-12-03 22:53:06 +00:00
Brice Maron
4327ed8382
Revoke DB rights on install only if the db is newly created
2012-12-03 20:20:17 +00:00
Robin Appelman
be30b1a8de
merge master into filesystem
2012-12-03 18:02:22 +01:00
Thomas Müller
cee92bde20
Merge pull request #682 from VicDeo/master
...
Minor cleanup in OC_OCSClient::getKnownledgebaseEntries. Fix for #487
2012-12-03 02:18:04 -08:00
Jenkins for ownCloud
f4d7955fe6
[tx-robot] updated from transifex
2012-12-03 00:05:40 +01:00
Victor Dubiniuk
3d5ffebb52
Clean KB entries processing code
2012-12-02 23:54:53 +03:00
Thomas Mueller
35e55214e2
[Contacts API] example for searching added
2012-12-02 11:54:30 +01:00
Robin Appelman
01eb5d2790
fix some edge cases while scanning the root of a storage
2012-12-02 03:43:51 +01:00
Isaac Rosenberg
d3ea7feb6b
Update lib/image.php
...
Corrected simple typo
2012-12-01 21:13:08 -05:00
Robin Appelman
72b6faa69d
merge master into filesystem
2012-12-02 03:03:48 +01:00
Jenkins for ownCloud
401c56ce7b
[tx-robot] updated from transifex
2012-12-02 00:03:12 +01:00
Robin Appelman
702444b242
fail gracefully when no old filecache is present during upgrade
2012-12-01 00:59:49 +01:00
Bart Visscher
8ce3aca331
Move loading of all the apps to setting the active navigation entry.
...
We can't do the loading before matching the route, because some routes
need to do the loading after matching of the route. For example the
navigation detection of the app settings page.
2012-11-30 12:47:44 +01:00
Bart Visscher
4db53f9d8e
Merge pull request #619 from samtuke/versions_cache
...
OC_FSV->copy now only caches files which are copied from data/user/files
2012-11-30 03:25:06 -08:00
Robin Appelman
dbbb357f62
add upgrade path from old cache to preserve file id's
2012-11-30 01:41:30 +01:00
Robin Appelman
d33f697a5f
merge master into filesystem
2012-11-30 00:18:42 +01:00
Robin Appelman
bcb27c81d4
use new obEnd function instead of ob_end_clean
2012-11-29 18:01:21 +01:00
Robin Appelman
59d5aa2cb7
add function to safely end output buffering
2012-11-29 17:58:24 +01:00
Thomas Mueller
f99497a05a
test for search and unregister added
2012-11-28 23:10:30 +01:00
Thomas Mueller
2d597c2238
first unit tests implemented
2012-11-28 23:10:00 +01:00
Thomas Mueller
5b1dea56e5
change name to IAddressBook
2012-11-28 23:08:15 +01:00
Thomas Mueller
fba8c776e1
plugin mechanism implemented
2012-11-28 23:07:09 +01:00
Sam Tuke
6975c5537b
OC_FSV->copy now only caches files which are copied from data/user/files
...
Added contextual comments
2012-11-28 16:57:44 +00:00
Sam Tuke
60f4ea8ddc
Cleaned up docblock comments
2012-11-28 15:10:58 +00:00
Jörn Friedrich Dreyer
eaa625c9bc
Merge pull request #401 from owncloud/share_hooks
...
Create functions to install standard hooks
2012-11-28 04:35:52 -08:00
Jenkins for ownCloud
1d4d4fd678
[tx-robot] updated from transifex
2012-11-28 00:11:21 +01:00
Jenkins for ownCloud
d251f04b98
[tx-robot] updated from transifex
2012-11-27 00:10:47 +01:00
Jörn Friedrich Dreyer
71e8755d31
Merge pull request #380 from butonic/feature_share_link_with_token
...
Feature share link with token
2012-11-26 07:42:53 -08:00
Jenkins for ownCloud
7892204077
[tx-robot] updated from transifex
2012-11-26 00:02:04 +01:00
Robin Appelman
a609992a75
better check if we are passing a fileid to Cache::get
2012-11-25 16:30:57 +01:00
Robin Appelman
0cfef83ed9
sort output of getFolderContent by name
2012-11-25 16:08:35 +01:00
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
Thomas Tanghus
8cffbb5f7d
Added some more error checking on db queries.
2012-10-31 20:47:04 +01:00
Thomas Tanghus
5a738380f6
Cast object ids to integers.
2012-10-31 20:06:39 +01:00
Lukas Reschke
7a7f12a0c1
Create only one CSRF token per session
...
Before, the CSRF token expired every hour. We had a script in place
which should refresh the token but this don't worked in every case.
(Laptop sleeping etc.)
With this commit, the token will only get once created for every
session so that the "Token expired" warning shouldn't appear.
2012-10-31 18:37:59 +01:00
Thomas Tanghus
5fc0c89a73
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-31 16:09:11 +01:00
Thomas Müller
f851738169
Merge pull request #152 from scambra/webdav-quota
...
checking quota in webdav
2012-10-31 03:03:46 -07:00
Jenkins for ownCloud
aca6d3252f
[tx-robot] updated from transifex
2012-10-31 00:02:32 +01:00
Robin Appelman
6e9e263497
merge master into filesystem
2012-10-30 22:59:55 +01:00
Bart Visscher
6d09752940
DRY for creating htaccess to protect data-directory
2012-10-30 20:57:19 +01:00
Bart Visscher
246d7ea2ea
Separate control code from class definition
2012-10-30 20:56:31 +01:00
scambra
5af8adc169
code style changes
2012-10-30 12:17:15 +01:00
Jörn Friedrich Dreyer
b032819ab9
check for database error in userExists
2012-10-30 11:08:32 +01:00
scambra
d9c14292a4
fix checking quota in webdav, adding a sabredav plugin
2012-10-30 10:32:30 +01:00
Thomas Tanghus
5550cde03b
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Fix conflicts:
core/ajax/vcategories/add.php
core/ajax/vcategories/delete.php
2012-10-30 06:53:49 +01:00
Sam Tuke
3fdf239b47
Merge pull request #147 from owncloud/htaccess-upgrade-check
...
Generate .htaccess when upgrading from old versions
2012-10-29 16:28:46 -07:00
Jenkins for ownCloud
56cf7660bd
[tx-robot] updated from transifex
2012-10-30 00:01:50 +01:00
Lukas Reschke
f6b6780072
Don't use OC_Setup as it will show up the installer
2012-10-29 22:44:49 +01:00
Lukas Reschke
6903475841
Generate .htaccess when upgrading from old versions
...
When upgrading from old ownCloud versions like 2.x the .htaccess is not
generated - which exposes the data to the internet. This fix will
generate a .htaccess when upgrading. (And no one exists)
Fixes #127
2012-10-29 22:03:18 +01:00
Lukas Reschke
2e1199acb8
Merge pull request #133 from fmms/checkstyle02
...
NoSpaceAfterComma -- checkstyle cleanup
2012-10-29 12:35:12 -07:00
Lukas Reschke
ac784baef6
Generate only one CSRF token
2012-10-29 16:35:29 +01:00
Lukas Reschke
4d61eb3e4c
Fix a typo
2012-10-29 16:33:39 +01:00
Bart Visscher
a9ff5635d8
Move loading setting routing to OC_Router
2012-10-29 15:04:56 +01:00
Bart Visscher
40fe6c6346
Remove subnavigation key, not used
2012-10-29 15:04:55 +01:00
Bart Visscher
4d03b3dbaf
Add ETag caching for Javascript routes
2012-10-29 15:04:55 +01:00
Bart Visscher
a7806076b1
Move generating cache key from files from OC_Minimizer to OC_Cache
2012-10-29 15:04:55 +01:00
Michael Gapczynski
5aec26a37c
Fix MySQL install, bug fix for issue 132
2012-10-28 19:50:26 -04:00
Michael Gapczynski
a6e18e0b6d
Check if error_report() is equal to 0, so suppressed errors aren't logged e.g. the htaccesstext.txt fopen failing
2012-10-28 19:38:57 -04:00
Jenkins for ownCloud
dbb4e74c79
[tx-robot] updated from transifex
2012-10-29 00:02:45 +01:00
Felix Moeller
dfc8228fb4
NoSpaceAfterComma
2012-10-28 23:58:08 +01:00
Felix Moeller
5d640f9ae3
NoSpaceAfterComma
2012-10-28 18:28:16 +01:00
Felix Moeller
b7a02f0c93
NoSpaceAfterComma
...
first in new branch
2012-10-28 18:12:31 +01:00
Robin Appelman
6bc156ba69
add svg mimetype to default htaccess
2012-10-28 16:03:52 +01:00
Arthur Schiwon
be215a097a
check if RUNTIME_NOAPPS is set before using it
2012-10-28 15:10:22 +01:00
Georg Ehrke
d7a6b09406
deny the usage of dots in database name
2012-10-28 14:11:41 +01:00
Arthur Schiwon
b8a48b55a3
make sure all filesystem apps are loaded when setupFS is proceeded, to make sure the emmited setup-hook is received. Fixes #89
2012-10-28 13:48:08 +01:00
Arthur Schiwon
5b9ba2e033
remove whitespaces, no code change
2012-10-28 13:48:08 +01:00
Bernhard Posselt
bf3dac05d1
added functions for printing escaped and unescaped values
2012-10-28 13:28:22 +01:00
Tom Needham
bcdf3a23db
Merge master into ocs_api
2012-10-28 11:16:04 +00:00
Tom Needham
b079447988
Add API method for sharing a file, currently only via a link.
2012-10-28 11:06:47 +00:00
Tom Needham
07111ff672
Allow apps to pass defaults and requirements for their API calls
2012-10-28 11:04:23 +00:00
Robin Appelman
b07672821b
check for changes when using the cache api
2012-10-28 11:43:45 +01:00
Robin Appelman
fba7be1194
add filesystem watcher to detect updates
2012-10-28 11:39:37 +01:00
Robin Appelman
c4a793913c
Merge branch 'master' into filesystem
2012-10-28 10:28:25 +01:00
Jenkins for ownCloud
1a08ef6a06
[tx-robot] updated from transifex
2012-10-28 00:02:29 +02:00
Robin Appelman
c964fe9f8d
merge master into filesystem
2012-10-27 18:11:52 +02:00
Robin Appelman
79d0ac21cc
delete child entries when a folder gets removed from cache
2012-10-27 18:08:00 +02:00
Robin Appelman
56e9ce44c3
add a way to recalucale the size of a folder in the cache
2012-10-27 18:08:00 +02:00
Björn Schießle
0d3f68cc7a
fix function documentation
2012-10-27 18:08:00 +02:00
Bart Visscher
fecfeac55d
Fix introduced style errors
2012-10-27 17:45:15 +02:00
Bart Visscher
894d44e796
Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git'
...
Conflicts:
lib/base.php
2012-10-27 16:33:10 +02:00
Björn Schießle
8a3eda16f2
fix function documentation
2012-10-27 15:53:10 +02:00
Robin Appelman
38371d1275
Merge branch 'master' into filesystem
2012-10-27 14:28:24 +02:00
Robin Appelman
5bfff6c56e
use absolute paths when resolving mount points
2012-10-27 12:17:35 +02:00
Bart Visscher
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
Bart Visscher
43e8293d9c
Change Symfony/Component/Routing from submodule to composer fetching
2012-10-27 11:32:16 +02:00
Robin Appelman
3437071cf1
remove old searchByMime
2012-10-27 10:40:27 +02:00
Robin Appelman
fcc92a9f43
add searchByMime to new cache api
2012-10-27 10:34:25 +02:00
Jakob Sack
d0bbd9416b
Add BackgroundJob::setExecutionType() to public API
2012-10-27 10:15:39 +02:00
Jakob Sack
9cf9d41e51
Add a new backgroundjob class to access the type of background jobs easily
2012-10-27 10:08:56 +02:00
Robin Appelman
cbc71784c0
Merge branch 'master' into filesystem
2012-10-27 10:02:26 +02:00
Robin Appelman
695405dfeb
add permissions data to the results of the cache api
2012-10-27 10:01:20 +02:00
Jenkins for ownCloud
3bef19c623
[tx-robot] updated from transifex
2012-10-27 00:02:05 +02:00
Robin Appelman
9953427197
also use new cache api here
2012-10-26 23:26:12 +02:00
Robin Appelman
7d6da68d53
prove some compatibility with the old cache api
2012-10-26 23:25:52 +02:00
Florian Hülsmann
a48734bcb5
fixed user/group sharing hooks
2012-10-26 23:15:37 +02:00
Robin Appelman
6db81afab9
move some stuff to the new api
2012-10-26 23:05:02 +02:00
Bart Visscher
fe75793815
Split database setup code to functions
2012-10-26 22:48:57 +02:00
Robin Appelman
4b616764e8
Merge branch 'master' into filesystem
2012-10-26 22:32:44 +02:00
Florian Hülsmann
b7bf28d1c7
Hook emission on sharing stuff
2012-10-26 20:53:32 +02:00
Victor Dubiniuk
d428d72dab
Fix mimetype detection with the 'file' utility
2012-10-26 21:02:04 +03:00
Robin Appelman
c22a723785
add file permissions cache
2012-10-26 19:07:29 +02:00
Robin Appelman
ad5957207d
merge master into filesystem
2012-10-26 18:29:24 +02:00
Robin Appelman
ad720c4c17
possible fix for bombarding the server with the htaccess test during setup
2012-10-26 18:24:06 +02:00
Robin Appelman
286fd78865
Merge branch 'master' into filesystem
2012-10-26 17:40:57 +02:00
Robin Appelman
8bce661e4d
add search to the filecache api
2012-10-26 13:23:49 +02:00
Georg Ehrke
1888ac0d41
add the possibility to add an preupdate.php
2012-10-26 13:10:56 +02:00
Robin Appelman
7ef0ffe8ad
add View->putFileInfo to the filecache api
2012-10-26 12:43:23 +02:00
Robin Appelman
e63e246c48
fix problem with normalizePath when there was a double leading slash
2012-10-26 12:37:49 +02:00
Robin Appelman
39adadd3e3
move the cache api from OC_Files to filesystem(view)
2012-10-26 12:30:25 +02:00
Robin Appelman
0e2bf8d373
Merge branch 'master' into filesystem
2012-10-26 10:42:41 +02:00
Jenkins for ownCloud
c7d64811d6
[tx-robot] updated from transifex
2012-10-26 02:05:56 +02:00
Thomas Tanghus
d9d8da0a5c
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-25 20:34:03 +02:00
Robin Appelman
7bc49d2a57
merge master into filesystem
2012-10-25 18:26:08 +02:00
Lukas Reschke
228a05a792
Check for iconv
2012-10-25 16:49:55 +02:00
Lukas Reschke
55277c8e5a
Allow any characters in the groupname
...
Fixes #82
2012-10-25 11:54:31 +02:00
Jenkins for ownCloud
43bae1b473
[tx-robot] updated from transifex
2012-10-25 02:11:53 +02:00
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
Robin Appelman
5a3d6805a2
cleanup OC_Files a bit
2012-10-24 15:52:30 +02:00
Robin Appelman
7b150dfa96
merge master into filesystem
2012-10-24 15:32:29 +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
56c7ee799c
use strtotime on non-nummeric times in oc_filesystem::touch
2012-10-23 16:37:46 +02: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
Robin Appelman
7424f3aef6
merge master into filesystem
2012-10-23 16:16:46 +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
Robin Appelman
707bd68bb4
automatically scan files when needed
2012-10-21 22:05:29 +02:00
Robin Appelman
5217ca219a
Merge branch 'master' into filesystem
2012-10-21 15:16:23 +02:00
Robin Appelman
2522c25af7
use OC_Files::getFileInfo and OC_Files::getDirectoryContent as high level api for the filecache
...
most apps would want to use this api instead of using the cache directly
2012-10-21 02:12:58 +02:00
Robin Appelman
01594b8610
remove chroot from filesystem api
2012-10-21 00:54:34 +02:00
Robin Appelman
3ff0772a05
add getCache and getScanner to storage api in order to allow storage backends to overwride caching behaviour
2012-10-21 00:31:32 +02:00
Robin Appelman
1901ac8b17
drop depricated is_readable and is_writable
2012-10-21 00:13:16 +02:00
Robin Appelman
cfa036eaa9
drop filectime from the filesystem api's
2012-10-20 23:58:07 +02:00
Robin Appelman
f7722abcb0
Merge branch 'master' into filesystem
2012-10-20 23:50:14 +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
Robin Appelman
9712a78559
merge master into filesystem
2012-10-18 23:24:28 +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
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
a7d8519550
when using oracle use LOWER() to make searching files case insensitive
2012-10-18 14:19:34 +02:00
Sam Tuke
265f3654af
all unit files_encryption crypt unit tests now passing after merge
2012-10-17 16:35:19 +01:00
Bart Visscher
6081bfa2bc
Merge branch 'master' into routing
...
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
2012-10-17 16:38:11 +02:00
Susinthiran Sithamparanathan
b2b84f3a6f
Update Sabre to version 1.7.1
2012-10-17 16:17:36 +02:00
Bart Visscher
44287d680b
Check for file exists before loading app version file
2012-10-17 14:06:25 +02:00
Robin Appelman
77cef5f514
merge master into filesystem
2012-10-17 13:14:17 +02: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
Thomas Tanghus
8cd268fc82
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-17 00:16:37 +02:00
Jenkins for ownCloud
fd6adc7d08
[tx-robot] updated from transifex
2012-10-16 23:39:13 +02:00
Michael Gapczynski
c00f5d164f
Fix unshareAll()
2012-10-16 16:27:23 -04:00
Lukas Reschke
379b775a56
Delete user files in /data/ after deleting a user
2012-10-16 22:05:06 +02:00
Michael Gapczynski
012ea1ed83
Add unshareAll() function to Share API
2012-10-16 15:38:52 -04:00
icewind1991
247626b5c2
Merge pull request #36 from scambra/filecache-fixes
...
delete fscache on deleting user
2012-10-16 11:46:50 -07:00
scambra
d8eb62232e
don't duplicate locales with country code
2012-10-16 20:31:46 +02:00
scambra
ec253f1354
Use strftime to format date with translated month names
2012-10-16 20:19:35 +02:00
Lukas Reschke
de7b46c66a
Use `get_magic_quotes_gpc()` to determine if magic_quotes is enabled
...
set_magic_quotes_runtime gives a PHP warning
2012-10-16 19:42:17 +02:00
Sam Tuke
8b01286a5d
Merged branch 'master'
2012-10-16 16:57:07 +01:00
scambra
e8441becdb
delete fscache on deleting user
2012-10-16 17:34:35 +02:00
Thomas Tanghus
102dd1242e
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-16 16:57:25 +02:00
Lukas Reschke
e7c9d5fe54
Set oc_token to httponly
2012-10-16 13:53:40 +02:00
Lukas Reschke
59404b5675
Merge pull request #31 from visit1985/persistentcookies
...
reresubmit: improved persistent cookies :)
2012-10-16 04:46:22 -07:00
Lukas Reschke
e299c241df
Make enhanced auth configurable
2012-10-16 01:08:05 +02:00
Lukas Reschke
c85c35dfae
Don't add the enhanced auth time to the configuration
2012-10-16 01:04:34 +02:00
Lukas Reschke
5c0407306c
Set a standard value for enhanced auth time
2012-10-16 01:04:20 +02:00
Lukas Reschke
6f2e8788ca
Make enhanced auth time configurable
2012-10-16 01:02:03 +02:00
Lukas Reschke
f4142bd2a8
Move isUserVerified to OC_Util
2012-10-16 00:47:38 +02:00
Lukas Reschke
77e18b01ba
Move the ( to the right position
2012-10-16 00:47:38 +02:00
Lukas Reschke
91d4b23efe
Fix PHP notice
2012-10-16 00:47:38 +02:00
Lukas Reschke
1a187d1ca5
Fix PHP notice
2012-10-16 00:47:38 +02:00
Lukas Reschke
097f429816
Add isUserVerified()
2012-10-16 00:47:38 +02:00
Victor Dubiniuk
ddcd738357
Merge branch 'extended_log'
...
PHP errors logging into the owncloud log
2012-10-16 01:30:45 +03:00
Lukas Reschke
c9ac1364d1
"deny from all" instead directory
2012-10-15 23:35:27 +02:00
Lukas Reschke
3eb43c1fbe
Show a warning in the installer if .htaccess is not working
2012-10-15 23:25:15 +02:00
Thomas Tanghus
9c9f5ef2d6
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-15 21:41:38 +02:00
Michael Göhler
8be9c04a3a
128byte is not 128bit - now we realy use 256bit (same as PHPSESSID)
2012-10-15 20:04:22 +02:00
Lukas Reschke
fa71e51e67
Use /dev/urandom instead of /dev/random
...
The usage of /dev/urandom is enough secure
2012-10-15 19:21:37 +02:00
Lukas Reschke
6e045b9ea1
Check if $_Post
2012-10-15 17:42:38 +02:00
Lukas Reschke
1c865f702c
Change verifyUser so that external json files can call it
2012-10-15 17:42:38 +02:00
Lukas Reschke
4d7b0e9bb3
verifyUser() for the json part
2012-10-15 17:42:38 +02:00
Lukas Reschke
d33bec09fe
Verify password page for users
2012-10-15 17:42:38 +02:00
Lukas Reschke
f08ff3b6e6
Correct formatting
2012-10-15 15:25:40 +03:00
Lukas Reschke
c930ac9f88
Merge pull request #30 from visit1985/logonpage
...
extend logon page to display multiple error messages
2012-10-15 03:52:11 -07:00
Michael Göhler
22fa23b4da
extend configkey column to hold 128bit values
2012-10-14 22:37:05 +02:00
Michael Göhler
ae1f33db54
implement fixed php session timeout and session id regeneration
2012-10-14 22:36:26 +02:00
Michael Göhler
b92fd984aa
removed username and password from token generation
2012-10-14 22:36:26 +02:00
Michael Göhler
a6c4046f48
fixed typo and redundant method call
2012-10-14 22:36:25 +02:00
Michael Göhler
d8fe6fbb40
added a warning message to the log when a cookie is rejected
2012-10-14 22:36:25 +02:00
Michael Göhler
382f8d060c
fixed wrong variable usage
2012-10-14 22:36:25 +02:00
Michael Göhler
38b9bffaea
call unsetMagicInCookie if token is invalid
2012-10-14 22:36:25 +02:00
Michael Göhler
eb79ccafe3
forgot a class name
2012-10-14 22:36:25 +02:00
Michael Göhler
2ea06f67bd
delete all tokens on password change
2012-10-14 22:36:25 +02:00
Michael Göhler
45f1c3f120
further improvements on multiple login token support
...
outdated tokens are deleted before checking against cookies
if an invalid token is used we delete all stored tokens for saveness
used token will be replaced by a new one after successful authentication
2012-10-14 22:36:25 +02:00
Michael Göhler
ee5d0f328f
improve token security
...
switched from time() to internal method OC_Util::generate_random_bytes()
2012-10-14 22:36:25 +02:00
Bart Visscher
4b799a6982
Make the lifetime of the remember login cookie
2012-10-14 22:36:25 +02:00
Bart Visscher
7f3e0b5566
Cleanup login tokens on login success
2012-10-14 22:36:25 +02:00
Bart Visscher
1012d317e3
Add support for multiple login cookie tokens
2012-10-14 22:36:25 +02:00
Bart Visscher
4af5b016cc
Whitespace cleanup
2012-10-14 21:04:08 +02:00
Michael Göhler
7095b3a083
extend logon page to display multiple error messages
2012-10-14 19:57:24 +02:00
Lukas Reschke
2c427f050e
Show a warning in the installer if no secure RNG is available
2012-10-14 17:18:30 +02:00
Lukas Reschke
d6c4b83f13
Fallback to /dev/random if openssl_random_pseudo_bytes not available
2012-10-14 16:14:45 +02:00
Jenkins for ownCloud
c88cf5cae5
[tx-robot] updated from transifex
2012-10-14 02:08:47 +02:00
Robin Appelman
93cbd96662
don't increase the size of the users home folder twice
2012-10-13 14:52:58 +02:00
Robin Appelman
11e9ce25e6
merge master into filesystem
2012-10-13 04:29:20 +02:00
Jenkins for ownCloud
d386bc8737
[tx-robot] updated from transifex
2012-10-13 02:08:50 +02:00
Lukas Reschke
77fbdb2ca8
Fix the require path
2012-10-13 01:10:04 +02:00
Björn Schießle
e38b736a1e
fix bug #1977 : remove etags from database after version rollback so that the client can detect the changes
2012-10-12 17:37:59 +02:00
Björn Schießle
079f0788d2
this is no longer needed, commit cb91e27ab3
should fix the issue
2012-10-12 17:35:57 +02:00
Björn Schießle
d4fd83301a
remove unneeded variable
2012-10-12 16:33:57 +02:00
Björn Schießle
cb91e27ab3
check if directory already exist before executing mkdir
2012-10-12 16:31:03 +02:00
Bart Visscher
9a35bd76fb
Use resolved path for require_once in autoloader
2012-10-12 15:47:41 +02:00
Bart Visscher
351f724193
whitespace fixes
2012-10-12 15:47:41 +02:00
Robin Appelman
d589869a34
disable log when running tests
2012-10-12 15:45:05 +02:00
Björn Schießle
d7f43945e7
nortmalize path before adding it to the fscache to avoid multiple fscache entries for the same file
2012-10-12 10:26:49 +02:00
Jenkins for ownCloud
b761143047
[tx-robot] updated from transifex
2012-10-12 02:07:10 +02:00
Robin Appelman
fb2d2bc201
merge master into filesystem
2012-10-11 22:54:39 +02:00
Thomas Tanghus
c721eefe8e
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-11 22:25:20 +02:00
Björn Schießle
86d978be78
add *.ai files to the mimetypes list
2012-10-11 16:14:29 +02:00
Björn Schießle
4d451f649d
fixed offset calculation (bug #1961 )
2012-10-11 12:42:57 +02:00
Thomas Tanghus
7a30f46543
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-10 23:00:46 +02:00
Bart Visscher
2c3674ea87
Add logging when stripping apps from autoload include path
2012-10-10 21:06:15 +02:00
Bart Visscher
d4feb77eaf
Remove unused search code
2012-10-10 21:06:15 +02:00
Bart Visscher
c5983d37ad
No need to use array_search
2012-10-10 21:06:15 +02:00
Bart Visscher
fe40277ec2
Use __DIR__ instead of __FILE__ to get SERVERROOT
2012-10-10 21:06:15 +02:00
Sam Tuke
4da67b0a08
Development snapshot; encryption stream wrapper now successfully writes files, and passes unit tests
2012-10-10 18:40:59 +01:00
Lukas Reschke
d525654fcd
Correct indentation
2012-10-10 19:01:32 +02:00
Lukas Reschke
cda2135966
Send a HSTS HTTP header to enforce SSL
2012-10-10 18:56:14 +02:00
Robin Appelman
5c6e9518ed
drop Filesystem::getInternalPath and Filesystem::getStorage in favor of Filesystem::resolvePath
2012-10-10 17:46:29 +02:00
Frank Karlitschek
fe5b4d2fba
marks as 5.0 pre alpha
2012-10-10 15:35:19 +02:00
Robin Appelman
aaa1b73364
don't use depricated OC_Filesystem
2012-10-10 13:18:36 +02:00
Robin Appelman
c88c54bbb0
make sure we can do our tests again
2012-10-10 12:51:15 +02:00
Robin Appelman
4b9fbf46e5
add depricated OC_Filessystem for compatibility
2012-10-10 12:50:57 +02:00
Robin Appelman
07c5384189
fix namespaces in filesystem and filesystemview
2012-10-10 12:25:46 +02:00
Robin Appelman
9df60d27bd
move some code around
2012-10-10 11:54:44 +02:00
Robin Appelman
d717a5e55c
remove old filecache
2012-10-10 11:51:14 +02:00
Robin Appelman
13e7e82d19
merge master into filesystem
2012-10-10 11:30:44 +02:00
Björn Schießle
38e9bc2adb
extract the right parent directory from the path
...
add parent directory to the file cache if it does not exist yet.
2012-10-09 16:24:49 +02:00
Frank Karlitschek
8e0676a66b
4.5 final
2012-10-09 16:02:01 +02:00
Björn Schießle
2bd4035076
$CONFIG_DBTYPE was never assigned but used in this function
2012-10-09 11:17:10 +02:00
Björn Schießle
003241e847
fix for bug #1942 : Allow user to share with every group if "allow users to share with anyone" is set
2012-10-09 10:36:24 +02:00
Frank Karlitschek
67a4aa7cf0
RC 3
2012-10-08 23:58:17 +02:00
Robin Appelman
035d83fe91
don't use the workaround for shared files on the /Shared folder
2012-10-08 23:37:50 +02:00
Michael Gapczynski
025d308929
Actually fix shared webdav access
2012-10-08 17:21:52 -04:00
Michael Gapczynski
33d1906f23
Fix getting file info for subfolders in shared folders
2012-10-08 16:05:57 -04:00
Jörn Friedrich Dreyer
dc116b994d
reenable hack to use CURRENT_TIMESTAMP for postgresql when creating the database, fixes oc-1852
...
TODO for OC5: use CURRENT_TIMESTAMP for all databases. mysql supports it as a default for DATETIME since 5.6.5 [1]
as a fallback we could use <default>0000-01-01 00:00:00</default> everywhere
[1] http://bugs.mysql.com/bug.php?id=27645
http://dev.mysql.com/doc/refman/5.0/en/timestamp-initialization.html
http://www.postgresql.org/docs/8.1/static/functions-datetime.html
http://www.sqlite.org/lang_createtable.html
http://docs.oracle.com/cd/B19306_01/server.102/b14200/functions037.htm
2012-10-08 17:24:15 +02:00
Frank Karlitschek
b296328c61
put all the calls into one function and use tabs instead of spaces. Thanks to danimo for bugging me :-)
2012-10-08 15:58:50 +02:00
Frank Karlitschek
c701bed2e3
fix a lot of small layout bugs and make the apps page overall prettier plus add ratings finally
2012-10-08 15:49:48 +02:00
Robin Appelman
13515effc9
add Cache::getStatus
2012-10-08 14:58:21 +02:00
Robin Appelman
e7899e17de
merge phpunit into filesystem
2012-10-08 13:53:53 +02:00
Arthur Schiwon
3affeb5bd7
destroy invalid sessions
2012-10-08 13:36:11 +02:00
Björn Schießle
8357754ff1
added "uid_owner" to select statement
2012-10-08 13:22:08 +02:00
Frank Karlitschek
e9f04bedd4
add a sane socket timeout so that the interface stays responsive with a slow or not working internet connection
2012-10-08 12:00:29 +02:00
Frank Karlitschek
b7a5cc2fda
use socket timeout of 10 sec to stay responsive even with a slow internet connection or a not working server
2012-10-08 11:53:00 +02:00
Michael Gapczynski
5f462ec6f7
Fix - "Correct checking item source for share from same owner when generating item target"
2012-10-06 18:13:11 -04:00
Frank Karlitschek
5eaf95eedd
check for SimpleXML which seems to bw non default on Free BSD
2012-10-06 17:37:38 +02:00
Robin Appelman
5d196f14db
set folder size to 0 when scanning the filesystem
2012-10-05 22:35:51 +02:00
Bart Visscher
c2b4e53453
Add API description to OC_Route and OC_Router
2012-10-05 17:42:46 +02:00
Jörn Friedrich Dreyer
ee6d96b7a8
really fix checkstyle on archive tar
2012-10-05 12:54:18 +02:00
Jörn Friedrich Dreyer
b5f11195af
fix checkstyle on archive zip/tar
2012-10-05 12:42:11 +02:00
Jörn Friedrich Dreyer
00b34a09ea
cache tar archive headers
2012-10-05 12:29:36 +02:00
Björn Schießle
f493e97f5d
always generate access token, also for forms shown to anonymous users (e.g. public shares)
2012-10-05 10:32:38 +02:00
Bart Visscher
f3a211c03c
Implement routing on javascript side
2012-10-05 09:42:36 +02:00
Thomas Tanghus
ccf8df4405
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-05 02:11:30 +02:00
Jenkins for ownCloud
5c042d88ad
[tx-robot] updated from transifex
2012-10-04 02:07:35 +02:00
Thomas Tanghus
667d60e133
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-03 17:44:34 +02:00
Robin Appelman
b9b9fd9dba
more tests and fixes for the filesystem scanner
2012-10-03 13:07:19 +02:00
Frank Karlitschek
2d86258fc3
RC2
2012-10-03 12:39:48 +02:00
Robin Appelman
85be00be65
add some more test cases for the scanner
2012-10-03 11:40:09 +02:00
Robin Appelman
3c8e5ea358
this index cant be unique due to collisions of the root of different storages
2012-10-03 11:31:13 +02:00
Robin Appelman
e415e90c6d
make filestorage scanner non-static and add a simple test case
2012-10-03 11:24:49 +02:00
Robin Appelman
96d7cd5997
correct namespace usage in common filestorage backend
2012-10-03 11:24:10 +02:00
Robin Appelman
636c75ce06
better parent path bahaviour for the filecache
2012-10-03 11:23:33 +02:00
Robin Appelman
6134e554f2
new filecache table
2012-10-02 23:46:35 +02:00
Robin Appelman
92555eff71
add encrypted column to the new filecache
2012-10-02 23:34:45 +02:00
Robin Appelman
ac44506b40
Merge branch 'master' into filesystem
2012-10-02 23:29:13 +02:00
Thomas Tanghus
2c1c7eadaf
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-02 23:24:54 +02:00
Thomas Tanghus
6bfb2ca2a8
Added post_deleteUser hook to VCategories. Added methods for adding/removing object/category relations.
2012-10-02 22:47:59 +02:00
Michael Gapczynski
68c8faf39c
Correct checking item source for share from same owner when generating item target
2012-10-02 16:37:39 -04:00
Björn Schießle
431d92e7b2
we are sharing the same file again if item_source of the already shared file and the newly shared file is the same. Therefore we can use the same target name
2012-10-02 21:37:10 +02:00
Björn Schießle
db954f5aba
remove unnecessary code and add missing items to select statement
2012-10-02 18:59:20 +02:00
Björn Schießle
3e3038cafc
merge all possible conflicts into on array
2012-10-02 13:10:46 +02:00
Frank Karlitschek
3fdebaa5dc
automatically remove and prevent installation of apps with a require version less than the current one. We check now the first ad second part of the version number.
...
Also increase the require tags of the core apps to 4.9 Please note that 4.9 is the internal versionnumber of the upcoming 4.5 release.
You have to pu a <require>4.9</require> into the info.xml of your app to make it as compatible with 4.5
2012-10-02 12:10:45 +02:00
Arthur Schiwon
783c02eda9
fix create folder and upload file issue on win, fixes oc-1747, solution follows suggestion from bug tracker
2012-10-02 11:45:47 +02:00
Björn Schießle
c6c0fcc7c8
We can't rely on the assumption that if the matching target is from the same owner that the share type will be different.
...
Files in different folders can have the same name. Therefore also a unique name has to be generated if the matching
target it from the same user. Also for folders and files with the same name a unique target name has to be generated
If matching target is from the same owner, use the same target. The share type will be different so this isn't the sa
2012-10-02 11:41:26 +02:00
Thomas Tanghus
7d25443937
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-01 23:41:21 +02:00
Arthur Schiwon
68fa2b10da
Search: fix Notice and thus broken search with activiated error reporting
2012-10-01 19:11:26 +02:00
Robin Appelman
b7eb3f3dff
merge master into filesystem
2012-10-01 14:21:49 +02:00
Robin Appelman
91d12a2f3d
update the filecache by setting mtimes to 0 when the mount configuration has changed instead of clearing the cache
2012-09-30 16:12:16 +02:00
Robin Appelman
113c339c41
fix updating the filecache for when contents of a folder has changed
2012-09-30 16:11:01 +02:00
Thomas Tanghus
241862756e
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-09-30 06:51:40 +02:00
Robin Appelman
258782584e
fix mimetype detection using the 'file' command in some edge cases
2012-09-30 03:58:58 +02:00
Robin Appelman
f8eebcbb01
reload the current url when login in instead of always redirecting to the default app (oc-1873)
2012-09-30 03:47:37 +02:00
Lukas Reschke
e8afb3d312
Fix a typo
2012-09-30 00:08:20 +03:00
Bart Visscher
210ea4d9d9
fix actioninclude
2012-09-29 18:03:34 +02:00
Lukas Reschke
ef57e9294b
Fallback for systems without openssl
2012-09-29 16:44:02 +02:00
Lukas Reschke
992c2c9d4b
mt_rand() is not secure from a cryptographic point of view, let's use openssl_random_pseudo_bytes() here
2012-09-29 15:41:13 +02:00
Lukas Reschke
578aa4e425
Removed sectoken
...
This token is completly useless since an attacker can easily extract it
from the page.
2012-09-29 15:18:38 +02:00
Lukas Reschke
bd804b74c4
mt_rand() is not secure from a security point of view and predictable. Let's use openssl_random_pseudo_bytes() instead.
...
Before: 26 bits entropy
After: 72 bits entropy
2012-09-29 15:03:09 +02:00
Jenkins for ownCloud
dc66e94ee3
[tx-robot] updated from transifex
2012-09-29 02:04:55 +02:00
Bart Visscher
d0bd2bbf27
Convert menu entries of settings pages to use router
2012-09-28 23:20:17 +02:00
Bart Visscher
22d22d19c0
Do urlencoding in linkTo functions
2012-09-28 22:27:52 +02:00
Bart Visscher
dbdf3bde7c
Implement route for download in OC_Search_Provider_File
2012-09-28 22:20:17 +02:00
Bart Visscher
c9317b5a68
Merge branch 'master' into routing
2012-09-28 21:41:21 +02:00
Bart Visscher
fed34aecfa
Fix syntax error in removeETagHook
2012-09-28 21:30:06 +02:00
Bart Visscher
24bb7d16b7
urlencode filename in search result, fixes problems with & in name
2012-09-28 21:18:20 +02:00
Bart Visscher
366ae6661d
Simplify generating file search results
2012-09-28 21:18:20 +02:00