9bf367e7f8
merge master into filesystem
2013-01-15 14:57:23 +01:00
bb9cc227c2
Merge pull request #1087 from owncloud/ldap_multiple_dns
...
LDAP: ability to configure more than one base DN
2013-01-15 04:01:57 -08:00
fdd667a83c
[tx-robot] updated from transifex
2013-01-15 00:05:10 +01:00
71ae41716a
Merge pull request #1182 from owncloud/sanitizeHTML-Clean
...
Expanded one line if statement - Trivial
2013-01-14 14:37:23 -08:00
ab287d2ba4
Move { to same line
2013-01-14 22:04:31 +01:00
c845e75693
Expand if to multiple lines
...
Oneliners are ugly.
2013-01-14 22:01:52 +01:00
53ca0db434
Merge pull request #1177 from owncloud/OC_User--isAdminUser()
...
Check if user is admin - bool
2013-01-14 12:53:18 -08:00
eab6d7eb23
Enhanced auth is totally unmaintained and broken
...
Let's remove it, it's also not secure anymore with the introduction of
our API etc...
(And doesn't work with ldap etc…)
2013-01-14 21:39:49 +01:00
8b2307ce4b
Merge pull request #1172 from owncloud/isSubDirectory
...
Simplify the isSubDirectory() function
2013-01-14 12:36:38 -08:00
7455056d2d
Merge pull request #1169 from owncloud/webdav_L10n
...
user_webdavauth - l10n - Trivial
2013-01-14 12:28:51 -08:00
9eb16e06f7
Merge pull request #1135 from owncloud/allow_default_click_behaviour
...
allow default click behaviour
2013-01-14 11:24:02 -08:00
0810d80f8a
Add a closing )
...
Thanks Jenkins!
2013-01-14 20:10:10 +01:00
fef73d96d1
CP fail
2013-01-14 19:51:16 +01:00
31b1a73e1f
Check if user is admin - bool
...
There was no "isAdminUser()" function which returned bool. This is
irritiating as there were a loooooooot of places in the code which
checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not
use a function for this?
(Especially if you consider that we might change the group name in the
future, which would lead to problems then)
Additionally, @Raydiation needed such a method for his AppFramework :)
2013-01-14 19:45:17 +01:00
99adfbdb86
Check for string position instead of string existence
...
otherwise /foo/bar would be detected as a subfolder of /bar
THX @icewind1991
2013-01-14 16:51:35 +01:00
fa78fbe0c3
Merge pull request #1112 from Raydiation/master
...
This fixes a problem that prevented app routes from being loaded after ocs_api merge
2013-01-14 07:35:14 -08:00
e51055cd10
Revert "fix c&p error"
...
This reverts commit 9d41322cf0
2013-01-14 16:25:03 +01:00
9d41322cf0
fix c&p error
2013-01-14 16:15:35 +01:00
51a4240051
Merge pull request #1170 from owncloud/correctIndention
...
Remove ugly indentation - Trivial
2013-01-14 04:59:53 -08:00
cd802ed45b
Merge branch 'master' of github.com:owncloud/core
2013-01-14 10:33:17 +01:00
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
c29310aaef
[tx-robot] updated from transifex
2013-01-14 00:18:21 +01:00
b7db967dc5
Commentblocks should begin with two *
2013-01-13 14:54:18 +01:00
c27833b143
Add @brief to description
2013-01-13 14:50:31 +01:00
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
2a7e5faa37
Remove ugly indentation
2013-01-13 01:02:11 +01:00
9cfc195b7c
The => This
...
Sounds better for me.
2013-01-13 00:45:45 +01:00
90d0d08826
Improved the help text
2013-01-13 00:37:58 +01:00
fb7f9e25c3
legend - l10n
2013-01-13 00:32:44 +01:00
981fd5e424
[tx-robot] updated from transifex
2013-01-13 00:08:40 +01:00
eddf9f964a
Correct the link
2013-01-12 15:19:12 +01:00
689e37c0aa
Merge pull request #1160 from owncloud/updateContrib
...
Update CONTRIBUTING.md
2013-01-12 02:51:31 -08:00
850184ad6e
Updated browser log
2013-01-12 11:51:03 +01:00
2da5ddd71c
Adding database to server config
2013-01-12 09:08:23 +01:00
3a9ec45272
Merge pull request #1052 from owncloud/filesystem-etags
...
ETags stored in the file cache
2013-01-11 18:11:22 -08:00
094a852bff
Wrap the etag in double quotes
2013-01-11 21:09:58 -05:00
b30648cb7d
Don't waste time making another call since we know it doesn't exist
2013-01-11 21:09:01 -05:00
a00b9e0a03
Bump version
2013-01-11 21:01:28 -05:00
6f049d0889
Merge branch 'filesystem' into filesystem-etags
2013-01-11 21:00:02 -05:00
9e2f3a5324
Remove old create etag function
2013-01-11 20:59:53 -05:00
8a63bcc1e8
Don't use more entropy for etags
2013-01-11 20:56:36 -05:00
ad64ce189d
[tx-robot] updated from transifex
2013-01-12 00:10:58 +01:00
0bf8a1e62e
Typos
2013-01-11 23:40:14 +01:00
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
81472c8af4
Add the correct link to the apps repository
...
:oops:
2013-01-11 23:34:16 +01:00
7a7281987a
Add a space behind the ####
...
Makes it at least better readable for me.
2013-01-11 23:08:01 +01:00
4fa9e3cfc3
Uneeded newline
2013-01-11 23:00:48 +01:00
8501792cdd
Remove :
2013-01-11 22:59:41 +01:00
d832147f44
Add ownCloud version
2013-01-11 22:57:55 +01:00
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
Robin Appelman
blizzz
Jenkins for ownCloud
Lukas Reschke
Bart Visscher
Daniel Molkentin
Björn Schießle
Michael Gapczynski