wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8392 commits 157 branches 562 tags 714 MiB
Commit graph

8392 commits

This branch
This branch
All branches
Author SHA1 Message Date
Björn Schießle
60d5d5f636 fix for issue #1186, missing variables added 2013-01-15 14:34:15 +01:00
blizzz
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
Jenkins for ownCloud
fdd667a83c [tx-robot] updated from transifex 2013-01-15 00:05:10 +01:00
Lukas Reschke
71ae41716a Merge pull request #1182 from owncloud/sanitizeHTML-Clean 
Expanded one line if statement - Trivial
 2013-01-14 14:37:23 -08:00
Lukas Reschke
ab287d2ba4 Move { to same line 2013-01-14 22:04:31 +01:00
Lukas Reschke
c845e75693 Expand if to multiple lines 
Oneliners are ugly.
 2013-01-14 22:01:52 +01:00
Bart Visscher
53ca0db434 Merge pull request #1177 from owncloud/OC_User--isAdminUser() 
Check if user is admin - bool
 2013-01-14 12:53:18 -08:00
Lukas Reschke
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
Bart Visscher
8b2307ce4b Merge pull request #1172 from owncloud/isSubDirectory 
Simplify the isSubDirectory() function
 2013-01-14 12:36:38 -08:00
Bart Visscher
7455056d2d Merge pull request #1169 from owncloud/webdav_L10n 
user_webdavauth - l10n - Trivial
 2013-01-14 12:28:51 -08:00
Lukas Reschke
9eb16e06f7 Merge pull request #1135 from owncloud/allow_default_click_behaviour 
allow default click behaviour
 2013-01-14 11:24:02 -08:00
Lukas Reschke
0810d80f8a Add a closing ) 
Thanks Jenkins!
 2013-01-14 20:10:10 +01:00
Lukas Reschke
fef73d96d1 CP fail 2013-01-14 19:51:16 +01:00
Lukas Reschke
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
Lukas Reschke
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
Bart Visscher
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
Daniel Molkentin
e51055cd10 Revert "fix c&p error" 
This reverts commit 9d41322cf0.
 2013-01-14 16:25:03 +01:00
Daniel Molkentin
9d41322cf0 fix c&p error 2013-01-14 16:15:35 +01:00
Thomas Müller
51a4240051 Merge pull request #1170 from owncloud/correctIndention 
Remove ugly indentation - Trivial
 2013-01-14 04:59:53 -08:00
Björn Schießle
cd802ed45b Merge branch 'master' of github.com:owncloud/core 2013-01-14 10:33:17 +01:00
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