summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge master into navigationJan-Christoph Borchardt2013-01-15847-18820/+28224
|\
| * Merge pull request #1087 from owncloud/ldap_multiple_dnsblizzz2013-01-154-45/+105
| |\ | | | | | | LDAP: ability to configure more than one base DN
| | * dechex not necessary, do not waste time with itArthur Schiwon2013-01-081-1/+1
| | |
| | * Code styleArthur Schiwon2013-01-081-6/+10
| | |
| | * support LDAP search using multiple base DNs also with paged results, ↵Arthur Schiwon2013-01-041-33/+50
| | | | | | | | | | | | implements #395
| | * support multiple base DNsArthur Schiwon2013-01-031-5/+42
| | |
| | * Base DNs will be used as array, now, to support usage of multiple DNsArthur Schiwon2013-01-031-3/+3
| | |
| | * Switch to textarea to enable configuration of multiple DNsArthur Schiwon2013-01-032-4/+6
| | |
| | * LDAP: fix spellingArthur Schiwon2013-01-031-1/+1
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-01-15328-2930/+1168
| | |
| * | Merge pull request #1182 from owncloud/sanitizeHTML-CleanLukas Reschke2013-01-141-2/+5
| |\ \ | | | | | | | | Expanded one line if statement - Trivial
| | * | Move { to same lineLukas Reschke2013-01-141-2/+1
| | | |
| | * | Expand if to multiple linesLukas Reschke2013-01-141-2/+6
| |/ / | | | | | | Oneliners are ugly.
| * | Merge pull request #1177 from owncloud/OC_User--isAdminUser()Bart Visscher2013-01-1419-113/+38
| |\ \ | | | | | | | | Check if user is admin - bool
| | * | Enhanced auth is totally unmaintained and brokenLukas Reschke2013-01-146-76/+0
| | | | | | | | | | | | | | | | | | | | | | | | Let's remove it, it's also not secure anymore with the introduction of our API etc... (And doesn't work with ldap etc…)
| | * | Add a closing )Lukas Reschke2013-01-141-1/+1
| | | | | | | | | | | | | | | | Thanks Jenkins!
| | * | CP failLukas Reschke2013-01-141-1/+1
| | | |
| | * | Check if user is admin - boolLukas Reschke2013-01-1416-37/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 :)
| * | | Merge pull request #1172 from owncloud/isSubDirectoryBart Visscher2013-01-141-24/+4
| |\ \ \ | | | | | | | | | | Simplify the isSubDirectory() function
| | * | | Check for string position instead of string existenceLukas Reschke2013-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise /foo/bar would be detected as a subfolder of /bar THX @icewind1991
| | * | | Commentblocks should begin with two *Lukas Reschke2013-01-131-1/+1
| | | | |
| | * | | Add @brief to descriptionLukas Reschke2013-01-131-1/+1
| | | | |
| | * | | Simplify the isSubDirectory() functionLukas Reschke2013-01-131-22/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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!
| * | | | Merge pull request #1169 from owncloud/webdav_L10nBart Visscher2013-01-141-2/+2
| |\ \ \ \ | | | | | | | | | | | | user_webdavauth - l10n - Trivial
| | * | | | The => ThisLukas Reschke2013-01-131-1/+1
| | | | | | | | | | | | | | | | | | Sounds better for me.
| | * | | | Improved the help textLukas Reschke2013-01-131-1/+1
| | | | | |
| | * | | | legend - l10nLukas Reschke2013-01-131-1/+1
| | |/ / /
| * | | | Merge pull request #1135 from owncloud/allow_default_click_behaviourLukas Reschke2013-01-141-1/+2
| |\ \ \ \ | | |_|/ / | |/| | | allow default click behaviour
| | * | | allow default click behaviourJörn Friedrich Dreyer2013-01-091-1/+2
| | | | |
| * | | | Merge pull request #1112 from Raydiation/masterBart Visscher2013-01-141-17/+5
| |\ \ \ \ | | | | | | | | | | | | This fixes a problem that prevented app routes from being loaded after ocs_api merge
| | * | | | added cleanup recommendations by including ocs in the cachedKey method and ↵Bernhard Posselt2013-01-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | moving the ocs routes stuff at the end of the loadRoutes method
| | * | | | readded ocs routesBernhard Posselt2013-01-071-0/+5
| | | | | |
| | * | | | fixed error that displayed a white page and a warning that routes could not ↵Bernhard Posselt2013-01-071-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | be loaded from apps that was caused by the ocs_api merge
| * | | | | Revert "fix c&p error"Daniel Molkentin2013-01-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9d41322cf0943e3960a4a7dc5878c713b8fedbca.
| * | | | | fix c&p errorDaniel Molkentin2013-01-141-3/+3
| | | | | |
| * | | | | Merge pull request #1170 from owncloud/correctIndentionThomas Müller2013-01-142-78/+78
| |\ \ \ \ \ | | | | | | | | | | | | | | Remove ugly indentation - Trivial
| | * | | | | Remove ugly indentationLukas Reschke2013-01-132-78/+78
| | | | | | |
| * | | | | | Merge branch 'master' of github.com:owncloud/coreBjörn Schießle2013-01-14429-5960/+7494
| |\ \ \ \ \ \
| | * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1416-45/+59
| | | |_|_|/ / | | |/| | | |
| | * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1320-53/+81
| | | | | | |
| | * | | | | Correct the linkLukas Reschke2013-01-121-1/+1
| | | | | | |
| | * | | | | Merge pull request #1160 from owncloud/updateContribLukas Reschke2013-01-122-4/+55
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Update CONTRIBUTING.md
| | | * | | | | Updated browser logLukas Reschke2013-01-121-4/+5
| | | | | | | |
| | | * | | | | Adding database to server configThomas Müller2013-01-121-1/+5
| | | | | | | |
| | | * | | | | TyposLukas Reschke2013-01-111-2/+2
| | | | | | | |
| | | * | | | | Add server operating system to templateLukas Reschke2013-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Thanks @eMerzh, could be especially needed as there are some platform specific issues like filename encoding under MS Windows
| | | * | | | | Add the correct link to the apps repositoryLukas Reschke2013-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | :oops:
| | | * | | | | Add a space behind the ####Lukas Reschke2013-01-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Makes it at least better readable for me.
| | | * | | | | Uneeded newlineLukas Reschke2013-01-111-2/+0
| | | | | | | |
| | | * | | | | Remove :Lukas Reschke2013-01-111-4/+4
| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-11 11:46:52 +0000