Commit Graph

2471 Commits

Author SHA1 Message Date
blizzz e0fdb8272b Merge pull request #371 from butonic/sql_and_error_log_fixes
add missing sql backticks, check sharing for error and add log
2012-11-12 03:37:43 -08:00
Jörn Friedrich Dreyer ba91f9a237 add missing sql backticks, check sharing for error and add log 2012-11-12 12:04:46 +01:00
Thomas Tanghus 82e010c51c Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-12 00:37:40 +01:00
Thomas Tanghus 56239df2e7 Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_* 2012-11-11 23:10:23 +01:00
Thomas Tanghus 7f0c69eb0e Added CRUDS permissions to the OCP namespace. Implements issue #345 2012-11-11 23:09:54 +01:00
Thomas Tanghus fd709fc021 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-11 20:20:09 +01:00
Diederik de Haas f6daddadf5 Fixed new checkstyle issues in util.php from build #1341. 2012-11-10 00:58:03 +01:00
Diederik de Haas 20541c610e Fixed new checkstyle issues in migrate.php from build #1341. 2012-11-10 00:53:28 +01:00
Jenkins for ownCloud 7ec0efe5c2 [tx-robot] updated from transifex 2012-11-10 00:02:29 +01:00
Thomas Müller 6dbdc16287 Merge pull request #340 from butonic/fix_quota_zero_cornercase
fix quota off by one error
2012-11-09 05:54:50 -08:00
Jörn Friedrich Dreyer c5ba4f476a fix quota off by one error 2012-11-09 14:34:15 +01:00
Stefan Seidel 8f669880bc Fix WebDAV (and Android Client) not being able to authorize on Debian Squeeze + mod_fcgid installs. 2012-11-09 13:30:07 +01:00
Thomas Müller c053863644 Merge pull request #330 from owncloud/check_connection
add a check and a warning if the ownCloud server is not able to establis...
2012-11-09 02:11:24 -08:00
Jenkins for ownCloud cb57a20ec2 [tx-robot] updated from transifex 2012-11-09 00:03:49 +01:00
Frank Karlitschek 55f75c6d8e add a check and a warning if the ownClodu server is not able to establish http connections to the internet. The reason is that users complained that external filesystem support, the update checker, downloading of new apps or the nowledgebase don´t work and don´t know why. 2012-11-08 18:08:44 +01:00
Tom Needham 8396c0478e Migration: Allow for no app data cases; handle file copying better 2012-11-08 11:37:27 +00:00
Tom Needham 0833be9d4e Migration: On import of user accounts only import folders in home dir, use OC_Helper::copyr
Check files when copying recursivley

Remove obsolete method

Dont count '.' and '..' as directories when importing.
2012-11-08 11:37:27 +00:00
Robin Appelman ae74c54d65 normalize filepaths in OC_Files::getFileInfo 2012-11-07 22:54:10 +01:00
Björn Schießle 250f40fe40 check if $path is a empty string 2012-11-07 17:35:07 +01:00
icewind1991 5cad2d7ccc Merge pull request #307 from owncloud/etag-function-overwrite
Allow apps to change the way etags are generated
2012-11-07 08:02:59 -08:00
Björn Schießle 311b04f609 backport from approved patch in stable45:
make root the default parameter for getAbsolutePath()
2012-11-07 16:54:42 +01:00
Thomas Tanghus 972ba89bc2 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-07 15:33:21 +01:00
Brice Maron ba62d8dea7 Fix quoting problem in fs mount. give Big DB error at least in PG 2012-11-07 15:27:34 +01:00
Robin Appelman 99aa972a40 Allow changing the way etags are generated 2012-11-07 14:21:34 +01:00
Robin Appelman 012a907a8a fix user specific mount configuration 2012-11-07 14:05:45 +01:00
Thomas Mueller 07ffa0de39 adding comments to explain what's going on here 2012-11-06 13:55:30 +01:00
Michael Gapczynski 3d13c9db70 Return empty array if file does not exist inside Shared folder, fixes issue #91 2012-11-05 17:54:23 -05:00
Thomas Mueller 415ec58422 fixes #329: query the database in chunks of 200 2012-11-05 22:42:03 +01:00
Thomas Tanghus a50f98606d Check DB result. 2012-11-05 16:24:16 +01:00
Thomas Tanghus 1147dc9774 Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
	lib/vcategories.php
2012-11-05 12:06:59 +01:00
Felix Moeller a4b2ea586d Style: Remove all the dangling white spaces 2012-11-04 22:16:04 +01:00
Felix Moeller 1e33ad9cbc Style: Different line endings in one file are bad for sure
I think Checkstyle did not find this occurence, however consistant line endings are preferred.
@DeepDiver can Checkstyle find this?
2012-11-04 19:11:53 +01:00
Felix Moeller 27ab0357ae Checkstyle: Fix last six NewlineBeforeOpenBrace 2012-11-04 18:36:16 +01:00
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 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 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
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
Jenkins for ownCloud 1a08ef6a06 [tx-robot] updated from transifex 2012-10-28 00:02:29 +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
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
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
Jenkins for ownCloud 3bef19c623 [tx-robot] updated from transifex 2012-10-27 00:02:05 +02:00
Florian Hülsmann a48734bcb5 fixed user/group sharing hooks 2012-10-26 23:15:37 +02:00
Bart Visscher fe75793815 Split database setup code to functions 2012-10-26 22:48:57 +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 ad720c4c17 possible fix for bombarding the server with the htaccess test during setup 2012-10-26 18:24:06 +02:00
Georg Ehrke 1888ac0d41 add the possibility to add an preupdate.php 2012-10-26 13:10:56 +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
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
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 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
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
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
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
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
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
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