summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1171 from owncloud/move-datadirectory-checksThomas Müller2013-01-311-30/+28
|\ | | | | Move data directory permission checks after data directory existence checks
| * Merge branch 'master' into move-datadirectory-checksMichael Gapczynski2013-01-1856-934/+963
| |\
| * | Move permissions check to new function checkDataDirectoryPermissions()Michael Gapczynski2013-01-181-28/+27
| | |
| * | Move data directory permission checks after data directory existence checksMichael Gapczynski2013-01-121-29/+28
| | |
* | | Merge pull request #1287 from owncloud/ocs_xml_attributesThomas Müller2013-01-311-2/+5
|\ \ \ | | | | | | | | API: Treat array keys starting with '@' as XML attributes
| * | | Simpler method for getting the first charTom Needham2013-01-241-1/+1
| | | |
| * | | Remove some whitespaceTom Needham2013-01-241-4/+0
| | | |
| * | | API: If key begins with '@' treat it as an xml attributeTom Needham2013-01-241-2/+9
| | | |
* | | | Merge pull request #1099 from herbrechtsmeier/ssl-proxyThomas Müller2013-01-316-7/+120
|\ \ \ \ | | | | | | | | | | add multiple domains reverse SSL proxy support
| * | | | add SSL proxy supportherbrechtsmeier2013-01-311-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for a reverse proxy that only forwards SSL connections unencrypted to the web server. This patch allows to detect the reverse proxy via regular expression for the remote IP address and conditional overwrite the host name, protocol and web root.
| * | | | add multiple domains reverse proxy supportStefan Herbrechtsmeier2013-01-316-5/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for a reverse proxy that handles multiple domains via different web roots (http[s]://proxy.tld/domain.tld/owncloud). As the reverse proxy web root is transparent for the web server the REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace the direct use of this _SERVER variables with function calls and extend this functions to overwrite the web root. Additionally it adds a Sabre request backend that extends the Sabre_HTTP_Request to use the same functions.
* | | | | Case insensitive Lang Detection fix #1328Brice Maron2013-01-311-1/+1
|/ / / /
* | | | Merge pull request #1379 from owncloud/improved_appsmanagementLukas Reschke2013-01-313-20/+125
|\ \ \ \ | | | | | | | | | | Improved appsmanagement
| * | | | just return "true" for nowFrank Karlitschek2013-01-311-0/+1
| | | | |
| * | | | style fixesThomas Mueller2013-01-311-21/+21
| | | | |
| * | | | style fixesThomas Mueller2013-01-311-10/+11
| | | | |
| * | | | remove spacesFrank Karlitschek2013-01-311-1/+1
| | | | |
| * | | | merge masterFrank Karlitschek2013-01-3084-993/+1462
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into improved_appsmanagement Conflicts: settings/apps.php settings/templates/apps.php
| * | | | | mark recommended apps. server part not yet fully implementedFrank Karlitschek2013-01-302-0/+9
| | | | | |
| * | | | | apps updater is now workingroot2013-01-302-22/+10
| | | | | |
| * | | | | we are getting closer. updating is not working yet.Frank Karlitschek2013-01-213-7/+110
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-311-0/+1
| | | | | |
* | | | | | remove some left over commentsBjörn Schießle2013-01-311-9/+2
| | | | | |
* | | | | | add missing bracketsBjörn Schießle2013-01-311-2/+3
| | | | | |
* | | | | | search for display name and uid (with no display name) since it is possible ↵Björn Schießle2013-01-311-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | that not all users have a seperate display name
* | | | | | Bumb version number for displayname db upgradeRobin Appelman2013-01-301-1/+1
| | | | | |
* | | | | | merge master into filesystemRobin Appelman2013-01-3016-8/+284
|\ \ \ \ \ \
| * | | | | | Update lib/base.phpirgsmirx2013-01-301-1/+1
| | |/ / / / | |/| | | | | | | | | | Correction of typo "locate" -> "locale".
| * | | | | Merge pull request #1308 from TheSFReader/masterJörn Friedrich Dreyer2013-01-301-5/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | Changed the linkTo function (from Helper class) to get rid of an unnecessary (and potentially non conform) leading '&' character when adding arguments
| | * \ \ \ \ Merge remote-tracking branch 'refs/remotes/upstream/master'TheSFReader2013-01-266-40/+142
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'refs/remotes/upstream/master'TheSFReader2013-01-2536-39/+176
| | |\ \ \ \ \ \
| | * | | | | | | Simplify the code and remove a first unnecessary (and non conform) '&' ↵TheSFReader2013-01-251-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | character when there are pending arguments
| * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-303-0/+3
| | | | | | | | |
| * | | | | | | | Merge pull request #1360 from owncloud/display_nameLukas Reschke2013-01-2910-2/+277
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | introduction of display names
| | * | | | | | | | only change display name if the display name from the current user was ↵Björn Schießle2013-01-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed; add correct display name to new user
| | * | | | | | | | version dump to trigger db updateBjörn Schießle2013-01-291-1/+1
| | | | | | | | | |
| | * | | | | | | | remove dubug valueBjörn Schießle2013-01-291-1/+1
| | | | | | | | | |
| | * | | | | | | | TypoArthur Schiwon2013-01-291-58/+58
| | | | | | | | | |
| | * | | | | | | | Adjust user interface to additions around displayName HandlingArthur Schiwon2013-01-291-0/+15
| | | | | | | | | |
| | * | | | | | | | search display name instead of uid; fix key/value order for array accessBjörn Schießle2013-01-281-1/+1
| | | | | | | | | |
| | * | | | | | | | implement DisplayNamesInGroup for database back-endBjörn Schießle2013-01-285-7/+37
| | | | | | | | | |
| | * | | | | | | | implement display names for the database back-endBjörn Schießle2013-01-281-0/+34
| | | | | | | | | |
| | * | | | | | | | update the display name for the database back-endBjörn Schießle2013-01-281-0/+18
| | | | | | | | | |
| | * | | | | | | | interface and API to change display namesBjörn Schießle2013-01-282-2/+19
| | | | | | | | | |
| | * | | | | | | | prepare user table to show and edit display namesBjörn Schießle2013-01-281-1/+1
| | | | | | | | | |
| | * | | | | | | | change order, key -> uid and value -> display name, this way it is also ↵Björn Schießle2013-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | possible to have non-unique display names
| | * | | | | | | | use display name to show share_width and owner informationBjörn Schießle2013-01-251-0/+9
| | | | | | | | | |
| | * | | | | | | | allow to get the display name from an abitrary userBjörn Schießle2013-01-252-4/+6
| | | | | | | | | |
| | * | | | | | | | get all display names from users in a given groupBjörn Schießle2013-01-255-6/+53
| | | | | | | | | |
| | * | | | | | | | get all display namesBjörn Schießle2013-01-253-0/+43
| | | | | | | | | |