Commit Graph

3059 Commits

Author SHA1 Message Date
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
Lukas Reschke cfc9839812 Merge pull request #19 from arkascha/master
Reimplementation of CSRF protection strategy
2012-09-28 10:54:11 -07:00
Christian Reiner 71454b1bca Fix to preserve backward compatibility for apps creating static links containing the request token (currently the contacts app and maybe some 3rd party implementations) 2012-09-28 18:57:20 +02:00
Björn Schießle 35357f3afb etag has to be removed after version rollback to enable the sync client to detect the changes (bug #1829) 2012-09-28 18:50:36 +02:00
Björn Schießle f8f73e2675 move back to "lastmodified" property since "getlastmodified" is protected by webdav 2012-09-28 18:50:36 +02:00
Bart Visscher bf1057143c Merge branch 'master' into routing
Conflicts:
	apps/files/js/filelist.js
	core/js/js.js
	lib/ocs.php
2012-09-28 15:38:49 +02:00
Christian Reiner 4dbd4c35c5 Merge branch 'master' of git://github.com/owncloud/core 2012-09-28 13:31:01 +02:00
Christian Reiner 743826bbf3 Reimplementation of CSRF protection including autorefresh 2012-09-28 13:30:44 +02:00
Jenkins for ownCloud 5144d26088 [tx-robot] updated from transifex 2012-09-28 02:06:03 +02:00
Robin Appelman e8df2eeefc some more sane column sizes for appconfig and preferences 2012-09-27 22:49:01 +02:00
Frank Karlitschek cf14ad2f7d RC 1 2012-09-27 04:10:19 +02:00
Robin Appelman 88bca9bc49 Merge branch 'master' into filesystem 2012-09-26 17:52:28 +02:00
Robin Appelman 522d7df860 convert Cache to a non-static class that handles the cache for a single storage backend 2012-09-26 17:52:02 +02:00
Björn Schießle a7292e897a The mtime in the file cache has to be updated after version rollback (copy from outside of the regular files root) (fixes bug #1720) 2012-09-26 17:03:54 +02:00
VicDeo 2b6869bcea Uncaught exception logging 2012-09-26 14:38:06 +03:00
Björn Schießle 50d7cfbbe7 prepare server for move of property name "lastmodified" to "getlastmodified" according to RFC4918.
Depreciated const can be removed after sync client update and release
2012-09-26 13:06:43 +02:00
Björn Schießle fcd70246db Merge branch 'master' of github.com:owncloud/core 2012-09-26 10:50:06 +02:00
Björn Schießle c3c6e52104 - take webdav namespace for properties into account
- change update routine to add the namesapce to all stored properties
2012-09-26 10:48:30 +02:00
Michael Gapczynski b4e40b1c21 Fix unsetting share expiration date 2012-09-26 00:09:35 -04:00
Michael Gapczynski f967bfc956 Properly format the share expiration time for the database, fixes bug oc-1779 2012-09-25 23:54:46 -04:00
Bart Visscher 737a6730db Add OC_Files::searchByMime function
Include shared files in result
2012-09-25 21:15:01 +02:00
Lukas Reschke c4fc291fa7 Passwords containing a ":" don't work with this explode
Thanks to mETz
2012-09-25 19:57:40 +02:00
Arthur Schiwon a8ff1505d6 backwards compat to older xcache versions, don't fail when trying to clear cache by prefix 2012-09-25 11:47:53 +02:00
Jenkins for ownCloud e5487376da [tx-robot] updated from transifex 2012-09-25 02:05:18 +02:00
Bart Visscher a80e0403a1 Fix getting individual shared file information 2012-09-24 21:12:32 +02:00
Jörn Friedrich Dreyer 1e2074b4eb use file instead of dir in search provider file fix result urls 2012-09-24 19:24:20 +02:00
Jenkins for ownCloud ecb90d72f3 [tx-robot] updated from transifex 2012-09-24 02:04:10 +02:00
Robin Appelman dcf995fff3 add Cache::getFolderContent 2012-09-23 15:25:03 +02:00
Robin Appelman eed1ccd164 Merge branch 'master' into filesystem 2012-09-23 02:41:31 +02:00
Robin Appelman 4131b205d4 fix some more phpdoc 2012-09-23 02:40:03 +02:00
Robin Appelman f71f731f1c fix phpdoc and handle some edges cases better in oc_db 2012-09-23 02:40:03 +02:00
Robin Appelman 6fafd5d4e9 this should be done elsewhere if needed 2012-09-23 01:46:52 +02:00
Robin Appelman 97b0eabc85 fix several problems in the new filecache in order to complete the tests 2012-09-22 15:43:48 +02:00
Robin Appelman 46896be0d4 fix namespace error in temporary storage backend 2012-09-22 15:03:17 +02:00
Robin Appelman b206d16b10 add support for loading namespaced test cases 2012-09-22 14:51:34 +02:00
Robin Appelman 153cd802a9 add partial file data to the result of Cache::get 2012-09-22 14:40:04 +02:00
Robin Appelman 93292516d9 Merge branch 'master' into filesystem 2012-09-22 14:28:14 +02:00
Lukas Reschke 80aa44565b Sanitize user input 2012-09-22 10:51:03 +02:00
Jenkins for ownCloud 01160d0fb4 [tx-robot] updated from transifex 2012-09-22 01:18:31 +02:00
Thomas Müller ac69974d73 Merge pull request #17 from scambra/4.5-l10n-fixes
Fix some untranslated strings
2012-09-21 16:09:30 -07:00
Bart Visscher 40a1899bd9 Catch exceptions when updating an app 2012-09-21 23:32:52 +02:00
Bart Visscher 4f4498e0d6 Fix undefined user var, use getUser 2012-09-21 21:29:37 +02:00
Bart Visscher 8820cd934a Forgot to return the fileinfo 2012-09-21 21:28:53 +02:00
Bart Visscher b6dc6c5bb9 Don't use OC_FileCache directly, but use the functions in OC_Files
This adds getFileInfo to OC_Files to also get fileinfo from shared files
2012-09-21 13:31:12 +02:00
scambra e48811017d fix translation for core/lostpassword 2012-09-21 11:54:47 +02:00
Jörn Friedrich Dreyer 59a00f95c3 use AL32UTF8 charset to connect to oracle, fixes file name encoding problems 2012-09-20 21:07:54 +02:00
Jörn Friedrich Dreyer a4082a526f escape user column in OC_FileCache::clear 2012-09-20 21:06:46 +02:00
Jenkins for ownCloud 7c42e88676 [tx-robot] updated from transifex 2012-09-20 02:09:31 +02:00
Robin Appelman 74ec2765b3 db indexes for appconfig and preferences 2012-09-20 01:36:52 +02:00
scambra 2b5133a1c4 check free space using folder's owner 2012-09-19 21:31:29 +02:00
Brice Maron 86c3761615 Catch unreadable app folder error 2012-09-19 19:26:57 +00:00
Frank Karlitschek fe7288b65a beta 4 2012-09-19 16:32:40 +02:00
Arthur Schiwon 93d0defe9a set configuvalue in table appconfig back to clob. Likely to break LDAP settings, probably responsible for some bugs with it. Might also cause damage in other apps. That's why it was once already set to clob 2012-09-19 12:55:07 +02:00
Jenkins for ownCloud b0e645fe13 [tx-robot] updated from transifex 2012-09-19 02:07:26 +02:00
Bart Visscher 703aff6c35 Run proxies and emit signals when finising chunked upload
Otherwise the file cache and the quota isn't checked
2012-09-18 20:23:17 +02:00
Tom Needham 30188847a3 Only try to delete migration.db if it was created. 2012-09-18 16:25:34 +00:00
Tom Needham be76a55ef0 Allow exporting of users from any user backend, fixed oc-1645 2012-09-18 16:24:39 +00:00
Sam Tuke 9df403f051 Added failsafes for retrieving remote apps on settings->apps page, in case categories or app data are not found 2012-09-18 16:55:03 +01:00
Björn Schießle 2570ea7114 don't interpret strpos '0' as 'false' in while loop 2012-09-18 16:14:04 +02:00
Sam Tuke dc0dc56d48 Merge branch 'master' of https://github.com/owncloud/core 2012-09-18 14:36:08 +01:00
Sam Tuke b765e883f3 Fixed bug with duplicate entries for installed 3rd party apps in settings->apps
Added method getAppstoreApps to OC_App
Added minor documentation
2012-09-18 14:35:27 +01:00
Jenkins for ownCloud 06e963c54f [tx-robot] updated from transifex 2012-09-18 02:04:26 +02:00
Robin Appelman 2a8ff8a0d4 fix problem with quota proxy when using copy 2012-09-17 22:16:07 +02:00
Robin Appelman 82ffefb99b dont trigger filesystem hooks when not using the default view 2012-09-17 22:16:07 +02:00
Bart Visscher b1bab6d113 Check format of chunked filename 2012-09-17 20:00:31 +02:00
Bart Visscher ce10e1c19a Fix return statement 2012-09-17 20:00:31 +02:00
Bart Visscher ab33578add Normalize path before calling removeETagPropertyForPath
This should also fix the dirname problem on windows
2012-09-17 20:00:31 +02:00
Björn Schießle 92413217b3 Merge branch 'master' of github.com:owncloud/core 2012-09-17 17:03:57 +02:00
Björn Schießle 1207ae1f99 add leading '?' to parameter list (fixes bug #1732) 2012-09-17 17:02:17 +02:00
Jörn Friedrich Dreyer 9da150cd3b use user name as db name for oracle connection made with service name 2012-09-17 16:32:24 +02:00
Thomas Tanghus 3273beb887 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-09-17 16:11:20 +02:00
Thomas Tanghus b1a6acde30 Added separate table for OC_VCategories and category/object (event/contact etc.) relations. 2012-09-17 16:03:15 +02:00
Thomas Tanghus ffe04182a8 Added methods OC_DB::insertIfNotExist() and OCP\DB::insertIfNotExist(). 2012-09-17 16:01:25 +02:00
Tom Needham 88b786e8dd Merge branch 'master' into ocs_api 2012-09-17 12:09:34 +00:00
Tom Needham 3ea01df1cd API: Parse PUT and DELETE variables 2012-09-17 12:08:17 +00:00
Tom Needham 8926038591 API: Fix merge conflict remnants 2012-09-17 12:07:42 +00:00
Frank Karlitschek a3718ca036 i just learned that we also have to check if directories are readable. it seams that is_readable also checks for 'x' right. 2012-09-16 22:49:03 +02:00
Robin Appelman 954596c251 rework filecache to work directly on storage backends wip 2012-09-16 16:52:32 +02:00
Jenkins for ownCloud fbdefd5601 [tx-robot] updated from transifex 2012-09-15 02:05:52 +02:00
Tom Needham 0f07226270 API: Allow admins to access SUBADMIN api methods 2012-09-14 13:41:06 +00:00
Jenkins for ownCloud e41ccd4344 [tx-robot] updated from transifex 2012-09-14 02:03:18 +02:00
Thomas Tanghus fdecee1bda Check if categories is an array. 2012-09-13 17:30:26 +02:00
Tom Needham a8c82440d0 API: Use http authentication, check the auth level required 2012-09-13 15:18:38 +00:00
Tom Needham 8b409dfe2a API: Default to user authentication level 2012-09-13 14:15:04 +00:00
Tom Needham b261c980c7 Fix autoloader merge conflict 2012-09-13 10:50:10 +00:00
Tom Needham 182f890110 Remove a merge conflict 2012-09-13 10:32:35 +00:00
Tom Needham 227ada3257 Fix merge conflicts 2012-09-13 10:23:41 +00:00
Tom Needham fa5dff22a0 API: Require api calls to register the required auth level 2012-09-13 09:41:20 +00:00
Frank Karlitschek 5a149dcfab mark as an updated beta 3 with some more fixes 2012-09-13 11:39:26 +02:00
Bart Visscher e3e4a2bec2 Enable post_write trigger
This is used when uploading a file with webdav. The trigger will add the file to the cache and make it show up in listings
2012-09-13 00:12:10 +02:00
Bart Visscher 78a022fda6 dirname can also return '.' for empty path 2012-09-13 00:09:00 +02:00
Robin Appelman c94fe38d39 add getPermissions to storage backends to get all permission flags in one go 2012-09-12 23:25:57 +02:00
Jörn Friedrich Dreyer d3553ce33d correctly calculate the MDB2 portability 2012-09-12 23:10:45 +02:00
Jörn Friedrich Dreyer c7054f374c log details for an error when upgrading the schema 2012-09-12 23:03:56 +02:00
Jörn Friedrich Dreyer b2d60ed6b7 add proper logging to filecache 2012-09-12 23:03:56 +02:00
Robin Appelman 68f65b657c add OC_Filesystem::resolvePath to get the storage backend and internal path for a file in one go 2012-09-12 22:53:10 +02:00
Robin Appelman e8d3a47685 add getId to storage backends 2012-09-12 22:50:10 +02:00
Victor Dubiniuk bbf8bb0bb3 Log PHP errors to the OC log 2012-09-12 22:30:04 +03:00
Bart Visscher 3efe1d3b24 Add linkToRoute functionality 2012-09-12 18:00:33 +02:00
Jörn Friedrich Dreyer 0fe3354c61 add proper error logging in OC_User database queries 2012-09-12 12:47:33 +02:00
Jörn Friedrich Dreyer e31dfb643a add getErrorMessage to OC_DB 2012-09-12 12:47:33 +02:00
Frank Karlitschek f31264a0c2 this is now 4.5 beta 3 2012-09-12 12:12:23 +02:00
Michael Gapczynski c5f9b887ff Don't call clearCache() for OC_Minimizer statically, create OC_Minimizer objects for both CSS and JS to clear cache after upgrade 2012-09-12 01:18:07 -04:00
Michael Gapczynski ca6322465d Treat getUsers() as case insensitive, helpful for showing proper results in the share with autocomplete 2012-09-12 01:12:25 -04:00
Michael Gapczynski 60feaf9abf Merge branch 'master' into share_expiration
Conflicts:
	core/js/share.js
	lib/util.php
2012-09-12 01:06:57 -04:00
Michael Gapczynski 8f0354bcdd Temporarily disable sharing with contacts and emails, will come in next release 2012-09-12 01:02:08 -04:00
Michael Gapczynski b194ac3dde Add expiration column to share table and bump version number 2012-09-12 01:01:45 -04:00
Jenkins for ownCloud 8c9c095d48 [tx-robot] updated from transifex 2012-09-12 02:02:58 +02:00
Thomas Mueller 5c1a79210f added hint to restart the web server in case recetly installed php modules are still not available 2012-09-11 23:51:12 +02:00
Jörn Friedrich Dreyer b6a106a920 allow using only dbname for oracle 2012-09-11 18:12:38 +02:00
Jörn Friedrich Dreyer bf2d1e78f2 don't set values with oc_appconfig when oc is not installed yet, allows to render guest page for installation again 2012-09-11 13:16:34 +02:00
Michael Gapczynski 37f0b85d3f Fix problem with non share collection item types being treated as collections 2012-09-11 00:37:31 -04:00
Jenkins for ownCloud 6a29bbda7a [tx-robot] updated from transifex 2012-09-11 02:03:53 +02:00
Georg Ehrke 463b48b2e1 fix file upload 2012-09-10 14:41:27 +02:00
Jörn Friedrich Dreyer 86c3f9b8fe Merge branch 'master' of github.com:owncloud/core 2012-09-10 14:14:49 +02:00
Jörn Friedrich Dreyer db7a18455f use tabs for indentation 2012-09-10 14:14:36 +02:00
Thomas Müller 5a65c5a46c Respect coding style 2012-09-10 14:59:08 +03:00
Thomas Müller 0444877218 Respect coding style 2012-09-10 12:35:15 +03:00
Thomas Müller c6cd1b77d3 Respect coding style 2012-09-10 12:32:49 +03:00
Thomas Müller 5721bd2786 Respect coding style 2012-09-10 12:31:57 +03:00
Thomas Müller 1a10955644 Respect coding style 2012-09-10 12:29:35 +03:00
Thomas Müller 2271a97992 Respect coding style 2012-09-10 12:28:09 +03:00
Thomas Müller 9a2bc5255b Respect coding style 2012-09-10 12:26:20 +03:00
Thomas Müller 23f348c99f Respect coding style 2012-09-10 12:25:42 +03:00
Thomas Müller 87e1a27fde Respect coding style 2012-09-10 12:23:55 +03:00
Thomas Müller f34588d1ff Respect coding style 2012-09-10 12:21:54 +03:00
Michael Gapczynski 6c17a4cb77 Don't display actions for children in shared collections, show the parent collection the child is shared in 2012-09-09 14:44:08 -04:00
Michael Gapczynski 13d513c17c Fix shared collection item searching 2012-09-09 11:50:12 -04:00
Michael Gapczynski 3e7951e1e6 Normalize the file path for shared children as a precaution 2012-09-08 23:42:24 -04:00
Michael Gapczynski fe7f095b08 Insert id for unique user group share rows 2012-09-08 23:09:58 -04:00
Michael Gapczynski b163bd514f Fix fetching shared children items, fixes problem with displaying owner of a shared file inside a shared folder 2012-09-08 23:09:57 -04:00
Michael Gapczynski f23f719d99 Fix unsharing from self for group shares and add test for it 2012-09-08 20:15:47 -04:00
Jenkins for ownCloud 5e790368bc [tx-robot] updated from transifex 2012-09-09 02:03:35 +02:00
Robin Appelman 46422e6dbe don't use regular expresions for a simple string replace 2012-09-08 23:40:23 +02:00
Robin Appelman 697061fa9f add OC_Image::fitIn 2012-09-08 23:26:19 +02:00
Thomas Tanghus abc930c57c Suppress error message which would send headers for hosted sited where disk_free_space() has been disabled for security. 2012-09-08 17:58:59 +02:00
Georg Ehrke 2b42893fa9 style fixes for public util api 2012-09-08 16:18:47 +02:00
Georg Ehrke 89f3afe2fe style fixes for public user api 2012-09-08 16:17:01 +02:00
Georg Ehrke 439ede2a1d style fixes for public response api 2012-09-08 16:15:42 +02:00
Georg Ehrke a16565a7fa style fixes for public json api 2012-09-08 16:14:06 +02:00
Georg Ehrke 89e5b85fa7 style fixes for public files api 2012-09-08 16:02:11 +02:00
Georg Ehrke 6b2b8b10ee style fixes for public db api 2012-09-08 16:00:32 +02:00
Georg Ehrke 221257d2fb style fixes for public config api 2012-09-08 15:58:28 +02:00
Georg Ehrke eca24f74f7 style fixes for public app api 2012-09-08 15:54:30 +02:00
Georg Ehrke c692dfc1ab style fixes for public app api 2012-09-08 15:52:29 +02:00
Jenkins for ownCloud d5d2e89622 [tx-robot] updated from transifex 2012-09-08 02:05:41 +02:00
Robin Appelman bd83422095 put filestorages in a namespace 2012-09-07 18:30:48 +02:00
Bart Visscher edcd297476 Move handling of core remotes to OC_TemplateLayout 2012-09-07 16:42:46 +02:00
Bart Visscher 631df21de6 Prevent loading all apps twice from overwriting the core scripts and styles 2012-09-07 16:20:13 +02:00
Bart Visscher ceec5e593c Remove redundant loadApps 2012-09-07 16:19:08 +02:00
Bart Visscher 5eba579827 Merge branch 'master' into routing
Conflicts:
	apps/files/js/fileactions.js
	lib/base.php
	lib/helper.php
	lib/ocs.php
2012-09-07 15:51:44 +02:00
Thomas Mueller 3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Bart Visscher 285c198c36 EOL fixes
apps/files_external/lib/config.php
apps/files_versions/lib/versions.php
lib/connector/sabre/client.php
2012-09-07 14:10:00 +02:00
Bart Visscher 5e55b4d6e7 Whitespace fixes in lib 2012-09-07 14:08:29 +02:00
Bart Visscher 386d1ac49f Fix setEtagHeader function 2012-09-07 13:42:22 +02:00
Bart Visscher cd4b8dbacd Change caching checks for minimized files
Only use a ETag, but include last modified time into this
Also added the filesize to this. And used the ETag for the
internal cache.
2012-09-07 13:42:22 +02:00
Bart Visscher ff42da58b9 Global file cache should also be able to clear with prefix 2012-09-07 13:42:22 +02:00
Bart Visscher 9ea7817a40 Remove core.{css,js} cache on upgrade 2012-09-07 13:42:22 +02:00
Michael Gapczynski 73d726d1b2 Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions 2012-09-07 00:02:22 -04:00
Jenkins for ownCloud a94b56b57b [tx-robot] updated from transifex 2012-09-07 02:07:22 +02:00
Frank Karlitschek 294cff27a7 add check for zlib 2012-09-07 01:39:11 +02:00
Robin Appelman d4fd47d43f clear user filecache after the user mount configuration has changed 2012-09-06 23:14:43 +02:00
Robin Appelman 2144b2f37a clear the filecache if the mount configuration has changed 2012-09-06 23:10:33 +02:00
Bart Visscher 39577495e1 Add a directory separator to filter app directories with the same
prefix.

Fixes: oc-1663
2012-09-06 22:27:56 +02:00
Michael Gapczynski 837eb1871d Don't delete the file anymore to replace it in the UI, just overwrite it 2012-09-05 22:13:50 -04:00
Jenkins for ownCloud af3e767489 [tx-robot] updated from transifex 2012-09-06 02:06:37 +02:00
Thomas Mueller ebb28412ca no more require_once() 2012-09-05 23:28:59 +02:00
Thomas Müller 24977d0fd0 Respect coding style 2012-09-05 15:49:42 +03:00
Thomas Müller e5cb638c09 Respect coding style 2012-09-05 15:42:06 +03:00
Thomas Müller d5fd5cd584 Respect coding style 2012-09-05 15:40:21 +03:00
Tom Needham 28a11959d7 API: Fix /person/check api method 2012-09-05 12:32:54 +00:00
Thomas Müller 9eccc0121a Respect coding style 2012-09-05 13:22:38 +03:00
Tom Needham 470b87f625 Fix ocs/person/check 2012-09-05 09:07:15 +00:00
Jenkins for ownCloud e8fcc71129 [tx-robot] updated from transifex 2012-09-05 02:05:39 +02:00
Thomas Mueller 1e2d582123 fixing button to add additional site 2012-09-04 23:42:49 +02:00
Bart Visscher 41f135daee Remove () from return statement 2012-09-04 21:27:36 +02:00
Thomas Müller 69ee842521 Fixing: http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-1617 2012-09-04 17:13:34 +03:00
Tom Needham 4224eb8831 API: remove OAuth auth check, respond in ocs formatted xml/json 2012-09-04 13:50:56 +00:00
Thomas Müller 7901fc33a8 fixing syntax error 2012-09-04 15:54:38 +03:00
Thomas Müller aff08925c1 fixing syntax error - sorry for that 2012-09-04 15:46:43 +03:00
Thomas Müller 2028500c0a fixing syntax error - sorry for that 2012-09-04 15:42:58 +03:00
Thomas Müller e4e0b5a822 Respect coding style 2012-09-04 15:34:09 +03:00
Thomas Müller d14f8fa681 Respect coding style 2012-09-04 15:21:52 +03:00
Tom Needham 37bb16becb API: Add callback_fail, add OC_OAuth::init and bespoke request token method 2012-09-04 11:10:42 +00:00
Thomas Müller 9760b5e153 Respect coding style 2012-09-04 13:32:27 +03:00
Jenkins for ownCloud b867b738e8 [tx-robot] updated from transifex 2012-09-04 02:03:21 +02:00
Bart Visscher 5153b8b293 Add url-params to url with new parameter in linkTo function 2012-09-03 21:51:32 +02:00
Bart Visscher 1a46192433 Add args parameter to linkTo(Absolute) function, to append the args automaticly 2012-09-03 21:51:32 +02:00
Frank Karlitschek bb65e173d4 4.5 beta 2 2012-09-03 20:38:50 +02:00
Jenkins for ownCloud d386e0172a [tx-robot] updated from transifex 2012-09-03 02:07:40 +02:00
Michael Gapczynski 4c065deb55 Listen to post_deleteGroup hook in Share API 2012-09-02 20:01:09 -04:00
Michael Gapczynski dc569ea300 Fix some warnings from Jenkins in the Share API 2012-09-02 19:30:01 -04:00
Michael Gapczynski db37a454b3 Add parameter documentation 2012-09-02 18:29:55 -04:00
Michael Gapczynski f0f2d93908 Restructure generateTarget for the post_addToGroup hook 2012-09-02 18:23:19 -04:00
Michael Gapczynski a77c16371f Make item targets be based off of the parent item target for reshares 2012-09-02 18:23:19 -04:00
Thomas Mueller 5f2751c672 in some cases no translations are loaded because $this->lang is empty not null 2012-09-02 14:15:03 +02:00
Robin Appelman 3c784ede83 use str_ireplace instead of duplicate str_replace 2012-09-02 13:58:01 +02:00
Jenkins for ownCloud 2bb7cb9f64 [tx-robot] updated from transifex 2012-09-02 02:02:53 +02:00
Michael Gapczynski 6c29334b48 Add support for share expiration 2012-09-01 18:53:48 -04:00
Robin Appelman 2508f64efe set debug mode if an xdebug session is active 2012-09-01 20:52:13 +02:00
Jörn Friedrich Dreyer 2c1f732880 use null instead of -1 on all getUser() 2012-09-01 20:50:03 +02:00