summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-021-4/+4
* Merge pull request #1413 from owncloud/enable_removing_search_providersFrank Karlitschek2013-02-011-0/+16
|\
| * add function to remove a search providerJörn Friedrich Dreyer2013-02-011-0/+16
* | Merge pull request #1384 from owncloud/upgrade_fixBart Visscher2013-02-011-70/+53
|\ \
| * | Still load js files in maintance modeRobin Appelman2013-01-301-2/+6
| * | Check for upgrade/maintance mode before trying to load an appRobin Appelman2013-01-301-70/+49
| |/
* | Merge pull request #1171 from owncloud/move-datadirectory-checksThomas Müller2013-01-311-30/+28
|\ \
| * \ 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
|\ \ \ \
| * | | | 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 SSL proxy supportherbrechtsmeier2013-01-311-4/+13
| * | | | | add multiple domains reverse proxy supportStefan Herbrechtsmeier2013-01-316-5/+109
* | | | | | Case insensitive Lang Detection fix #1328Brice Maron2013-01-311-1/+1
|/ / / / /
* | | | | Merge pull request #1379 from owncloud/improved_appsmanagementLukas Reschke2013-01-313-20/+125
|\ \ \ \ \
| * | | | | 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
| |\ \ \ \ \
| * | | | | | 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 t...Björn Schießle2013-01-311-5/+15
| |_|_|_|_|/ |/| | | | |
* | | | | | 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
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #1308 from TheSFReader/masterJörn Friedrich Dreyer2013-01-301-5/+2
| |\ \ \ \ \
| | * \ \ \ \ 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) '&' chara...TheSFReader2013-01-251-5/+2
| * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-303-0/+3
| * | | | | | | | Merge pull request #1360 from owncloud/display_nameLukas Reschke2013-01-2910-2/+277
| |\ \ \ \ \ \ \ \
| | * | | | | | | | only change display name if the display name from the current user was change...Björn Schießle2013-01-291-1/+3
| | * | | | | | | | 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