Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1171 from owncloud/move-datadirectory-checks | Thomas Müller | 2013-01-31 | 1 | -30/+28 |
|\ | | | | | Move data directory permission checks after data directory existence checks | ||||
| * | Merge branch 'master' into move-datadirectory-checks | Michael Gapczynski | 2013-01-18 | 56 | -934/+963 |
| |\ | |||||
| * | | Move permissions check to new function checkDataDirectoryPermissions() | Michael Gapczynski | 2013-01-18 | 1 | -28/+27 |
| | | | |||||
| * | | Move data directory permission checks after data directory existence checks | Michael Gapczynski | 2013-01-12 | 1 | -29/+28 |
| | | | |||||
* | | | Merge pull request #1287 from owncloud/ocs_xml_attributes | Thomas Müller | 2013-01-31 | 1 | -2/+5 |
|\ \ \ | | | | | | | | | API: Treat array keys starting with '@' as XML attributes | ||||
| * | | | Simpler method for getting the first char | Tom Needham | 2013-01-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | Remove some whitespace | Tom Needham | 2013-01-24 | 1 | -4/+0 |
| | | | | |||||
| * | | | API: If key begins with '@' treat it as an xml attribute | Tom Needham | 2013-01-24 | 1 | -2/+9 |
| | | | | |||||
* | | | | Merge pull request #1099 from herbrechtsmeier/ssl-proxy | Thomas Müller | 2013-01-31 | 6 | -7/+120 |
|\ \ \ \ | | | | | | | | | | | add multiple domains reverse SSL proxy support | ||||
| * | | | | add SSL proxy support | herbrechtsmeier | 2013-01-31 | 1 | -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 support | Stefan Herbrechtsmeier | 2013-01-31 | 6 | -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 #1328 | Brice Maron | 2013-01-31 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #1379 from owncloud/improved_appsmanagement | Lukas Reschke | 2013-01-31 | 3 | -20/+125 |
|\ \ \ \ | | | | | | | | | | | Improved appsmanagement | ||||
| * | | | | just return "true" for now | Frank Karlitschek | 2013-01-31 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | style fixes | Thomas Mueller | 2013-01-31 | 1 | -21/+21 |
| | | | | | |||||
| * | | | | style fixes | Thomas Mueller | 2013-01-31 | 1 | -10/+11 |
| | | | | | |||||
| * | | | | remove spaces | Frank Karlitschek | 2013-01-31 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | merge master | Frank Karlitschek | 2013-01-30 | 84 | -993/+1462 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into improved_appsmanagement Conflicts: settings/apps.php settings/templates/apps.php | ||||
| * | | | | | mark recommended apps. server part not yet fully implemented | Frank Karlitschek | 2013-01-30 | 2 | -0/+9 |
| | | | | | | |||||
| * | | | | | apps updater is now working | root | 2013-01-30 | 2 | -22/+10 |
| | | | | | | |||||
| * | | | | | we are getting closer. updating is not working yet. | Frank Karlitschek | 2013-01-21 | 3 | -7/+110 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-31 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | remove some left over comments | Björn Schießle | 2013-01-31 | 1 | -9/+2 |
| | | | | | | |||||
* | | | | | | add missing brackets | Björn Schießle | 2013-01-31 | 1 | -2/+3 |
| | | | | | | |||||
* | | | | | | search for display name and uid (with no display name) since it is possible ↵ | Björn Schießle | 2013-01-31 | 1 | -5/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | that not all users have a seperate display name | ||||
* | | | | | | Bumb version number for displayname db upgrade | Robin Appelman | 2013-01-30 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | merge master into filesystem | Robin Appelman | 2013-01-30 | 16 | -8/+284 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update lib/base.php | irgsmirx | 2013-01-30 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | | | | | | | Correction of typo "locate" -> "locale". | ||||
| * | | | | | Merge pull request #1308 from TheSFReader/master | Jörn Friedrich Dreyer | 2013-01-30 | 1 | -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' | TheSFReader | 2013-01-26 | 6 | -40/+142 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'refs/remotes/upstream/master' | TheSFReader | 2013-01-25 | 36 | -39/+176 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Simplify the code and remove a first unnecessary (and non conform) '&' ↵ | TheSFReader | 2013-01-25 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | character when there are pending arguments | ||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-30 | 3 | -0/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #1360 from owncloud/display_name | Lukas Reschke | 2013-01-29 | 10 | -2/+277 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | introduction of display names | ||||
| | * | | | | | | | | only change display name if the display name from the current user was ↵ | Björn Schießle | 2013-01-29 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed; add correct display name to new user | ||||
| | * | | | | | | | | version dump to trigger db update | Björn Schießle | 2013-01-29 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | remove dubug value | Björn Schießle | 2013-01-29 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Typo | Arthur Schiwon | 2013-01-29 | 1 | -58/+58 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Adjust user interface to additions around displayName Handling | Arthur Schiwon | 2013-01-29 | 1 | -0/+15 |
| | | | | | | | | | | |||||
| | * | | | | | | | | search display name instead of uid; fix key/value order for array access | Björn Schießle | 2013-01-28 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | implement DisplayNamesInGroup for database back-end | Björn Schießle | 2013-01-28 | 5 | -7/+37 |
| | | | | | | | | | | |||||
| | * | | | | | | | | implement display names for the database back-end | Björn Schießle | 2013-01-28 | 1 | -0/+34 |
| | | | | | | | | | | |||||
| | * | | | | | | | | update the display name for the database back-end | Björn Schießle | 2013-01-28 | 1 | -0/+18 |
| | | | | | | | | | | |||||
| | * | | | | | | | | interface and API to change display names | Björn Schießle | 2013-01-28 | 2 | -2/+19 |
| | | | | | | | | | | |||||
| | * | | | | | | | | prepare user table to show and edit display names | Björn Schießle | 2013-01-28 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | change order, key -> uid and value -> display name, this way it is also ↵ | Björn Schießle | 2013-01-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | possible to have non-unique display names | ||||
| | * | | | | | | | | use display name to show share_width and owner information | Björn Schießle | 2013-01-25 | 1 | -0/+9 |
| | | | | | | | | | | |||||
| | * | | | | | | | | allow to get the display name from an abitrary user | Björn Schießle | 2013-01-25 | 2 | -4/+6 |
| | | | | | | | | | | |||||
| | * | | | | | | | | get all display names from users in a given group | Björn Schießle | 2013-01-25 | 5 | -6/+53 |
| | | | | | | | | | | |||||
| | * | | | | | | | | get all display names | Björn Schießle | 2013-01-25 | 3 | -0/+43 |
| | | | | | | | | | |