Commit Graph

8435 Commits

Author SHA1 Message Date
Björn Schießle e0173303e6 merge conflict fixed, settings-personal.php is no longer needed
Conflicts:
	apps/files_versions/templates/settings-personal.php
2013-01-14 10:24:40 +01:00
Jenkins for ownCloud c29310aaef [tx-robot] updated from transifex 2013-01-14 00:18:21 +01:00
Lukas Reschke b7db967dc5 Commentblocks should begin with two * 2013-01-13 14:54:18 +01:00
Lukas Reschke c27833b143 Add @brief to description 2013-01-13 14:50:31 +01:00
Lukas Reschke e151210a62 Simplify the isSubDirectory() function
isSubDirectory() checks if a specified $sub is a subdirectory of the
$parent, this is needed to prevent file inclusions.

Actually, the current code is more kind of a "hack" which I always
struggle over if browsing through source. So this should be a much
better implementation.

The implementation is really straightforward:
- [realpath()](http://php.net/manual/function.realpath.php) expands all
symbolic links and resolves references to '/./', '/../' and extra '/'
characters in the input path and return the canonicalized absolute
pathname.
- [strpos()](php.net/manual/function.strpos.php) returns FALSE if the
substring wasn't found.

Since this is an absolutely critical piece of code, I'd like to ensure
that this is absolutely safe!
2013-01-13 14:33:19 +01:00
Lukas Reschke 2a7e5faa37 Remove ugly indentation 2013-01-13 01:02:11 +01:00
Lukas Reschke 9cfc195b7c The => This
Sounds better for me.
2013-01-13 00:45:45 +01:00
Lukas Reschke 90d0d08826 Improved the help text 2013-01-13 00:37:58 +01:00
Lukas Reschke fb7f9e25c3 legend - l10n 2013-01-13 00:32:44 +01:00
Jenkins for ownCloud 981fd5e424 [tx-robot] updated from transifex 2013-01-13 00:08:40 +01:00
Lukas Reschke eddf9f964a Correct the link 2013-01-12 15:19:12 +01:00
Lukas Reschke 689e37c0aa Merge pull request #1160 from owncloud/updateContrib
Update CONTRIBUTING.md
2013-01-12 02:51:31 -08:00
Lukas Reschke 850184ad6e Updated browser log 2013-01-12 11:51:03 +01:00
Thomas Müller 2da5ddd71c Adding database to server config 2013-01-12 09:08:23 +01:00
Jenkins for ownCloud ad64ce189d [tx-robot] updated from transifex 2013-01-12 00:10:58 +01:00
Lukas Reschke 0bf8a1e62e Typos 2013-01-11 23:40:14 +01:00
Lukas Reschke ca7658b240 Add server operating system to template
Thanks @eMerzh, could be especially needed as there are some platform specific issues like filename encoding under MS Windows
2013-01-11 23:39:37 +01:00
Lukas Reschke 81472c8af4 Add the correct link to the apps repository
:oops:
2013-01-11 23:34:16 +01:00
Lukas Reschke 7a7281987a Add a space behind the ####
Makes it at least better readable for me.
2013-01-11 23:08:01 +01:00
Lukas Reschke 4fa9e3cfc3 Uneeded newline 2013-01-11 23:00:48 +01:00
Lukas Reschke 8501792cdd Remove : 2013-01-11 22:59:41 +01:00
Lukas Reschke d832147f44 Add ownCloud version 2013-01-11 22:57:55 +01:00
Bart Visscher b608675938 Merge pull request #1157 owncloud/move-OpenID
Move openid.php to apps repo

Conflicts:
	settings/routes.php
2013-01-11 22:57:40 +01:00
Lukas Reschke ecde84a946 Add template 2013-01-11 22:57:30 +01:00
Lukas Reschke 98630dd0bc Create issue_template.md 2013-01-11 13:52:41 -08:00
Lukas Reschke 3695425c1c Fix a typo 2013-01-11 22:24:22 +01:00
Lukas Reschke 4272778a97 Update CONTRIBUTING.md 2013-01-11 22:22:08 +01:00
Lukas Reschke da4a50a7fc Remove uneeded link 2013-01-11 22:14:18 +01:00
Lukas Reschke e833ed3efb Merge pull request #1159 from LukasReschke/master
Add contribution file
2013-01-11 11:57:14 -08:00
Björn Schießle d276d21c76 - code clean-up
- some more code comments
- fixed bug in the expire function, cleanup all_versions array during run. Otherwise it could happen that we try to delete already deleted versions
2013-01-11 19:33:54 +01:00
Lukas Reschke 954b559d48 Merge pull request #994 from owncloud/enhanced_multiSelect
Enhanced multiSelect
2013-01-11 10:23:04 -08:00
Lukas Reschke 9b63f1d63e Added links to app + mirall repo 2013-01-11 19:19:04 +01:00
Lukas Reschke b7bdfe113d Update CONTRIBUTING.md 2013-01-11 18:59:56 +01:00
Lukas Reschke 809b264693 Create CONTRIBUTING.md 2013-01-11 09:57:56 -08:00
Lukas Reschke 1f6eb68ef9 Merge pull request #1150 from owncloud/EnableSSL-AdminMenu
Add security section to admin settings to enable the HTTPS enforcement
2013-01-11 09:21:08 -08:00
Lukas Reschke b6e0842f4c Merge pull request #1155 from owncloud/remove-setContentTypeHeader
Remove setContentTypeHeader()
2013-01-11 09:18:14 -08:00
Frank Karlitschek 507d4aa129 Merge pull request #1154 from owncloud/remove-uneededFile
Remove uneeded file
2013-01-11 09:16:55 -08:00
Lukas Reschke e11b650d2e Remove OpenID from the router 2013-01-11 17:24:10 +01:00
Lukas Reschke 1631ee4d60 Move to apps repo
This belongs to the apps repo.
2013-01-11 17:22:15 +01:00
Lukas Reschke 9b9f5b1a8a Remove setContentTypeHeader()
`OC_JSON::success` and `OC_JSON::error` are calling
`OC_JSON::encodedPrint`, which already sets these headers. So this two
calls are uneeded duplicates.
2013-01-11 17:09:36 +01:00
Lukas Reschke 216a5af396 Remove uneeded file
logout.php is a legacy file, which isn't used anymore in the ownCloud
code.
2013-01-11 16:49:55 +01:00
Lukas Reschke 1eb3c8ecf6 Correct link to the bugtracker in exception.php 2013-01-11 16:42:06 +01:00
Lukas Reschke ffbf273c9a Removed uneeded HTML tag 2013-01-11 14:43:56 +01:00
Björn Schießle 99a0ea44ee function description fixed 2013-01-11 14:24:00 +01:00
Björn Schießle 67d00bc6bb some more clean-up, isVersioned() is no longer needed; rename hook fixed if a complete folder gets renamed 2013-01-11 14:23:28 +01:00
Lukas Reschke 466cdab680 Add security section to admin menu
Currently it only allows the admin to enable or disable the HTTPS
enforcement, but in the future it could be expanded to further options.

The HTTPS enforcement only allows the admin to enforce it, if he is
connected via HTTPS. (To prevent admins to enable it without a proper
SSL setup)
2013-01-11 14:18:51 +01:00
Björn Schießle 6be9c0a974 some code clean-up 2013-01-11 11:12:32 +01:00
Thomas Müller 60489764f3 Merge pull request #1133 from owncloud/add_linebreaks_in_sharing
add more linebreaks, replace SQL LIMIT with param
2013-01-10 15:14:14 -08:00
Jenkins for ownCloud d03dce1283 [tx-robot] updated from transifex 2013-01-11 00:06:14 +01:00
Sean Comeau ba9c967435 Throw an exception when creating a MySQL user fails and display exception error text to user 2013-01-10 14:43:08 -08:00