summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove dubug valueBjörn Schießle2013-01-291-1/+1
* TypoArthur Schiwon2013-01-291-58/+58
* LDAP: implement support for ownCloud Display NamesArthur Schiwon2013-01-291-0/+44
* Adjust user interface to additions around displayName HandlingArthur Schiwon2013-01-291-0/+15
* rename Name to Login NameBjörn Schießle2013-01-281-2/+2
* show display name in input fieldBjörn Schießle2013-01-282-2/+4
* search display name instead of uid; fix key/value order for array accessBjörn Schießle2013-01-282-2/+2
* 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
* add display name to the database table oc_usersBjörn Schießle2013-01-281-0/+8
* 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-285-3/+59
* prepare user table to show and edit display namesBjörn Schießle2013-01-283-5/+10
* change order, key -> uid and value -> display name, this way it is also possi...Björn Schießle2013-01-281-2/+2
* typo fixedBjörn Schießle2013-01-251-1/+1
* use display name to show share_width and owner informationBjörn Schießle2013-01-252-9/+18
* show display name instead of uidBjörn Schießle2013-01-251-9/+10
* show display name instead of uid in the public shared files viewBjörn Schießle2013-01-252-2/+3
* allow to get the display name from an abitrary userBjörn Schießle2013-01-252-4/+6
* compare the correct uidsBjörn Schießle2013-01-252-1/+2
* get all display names from users in a given groupBjörn Schießle2013-01-256-7/+54
* get all display namesBjörn Schießle2013-01-254-5/+53
* add display name to title instead if login-IDBjörn Schießle2013-01-242-2/+2
* new branch which introduces display namesBjörn Schießle2013-01-243-2/+60
* Merge pull request #1265 from j-ed/masterLukas Reschke2013-01-242-2/+18
|\
| * Update config/config.sample.phpj-ed2013-01-221-2/+2
| * Update config/config.sample.phpj-ed2013-01-221-1/+1
| * Update config/config.sample.phpj-ed2013-01-221-0/+10
| * Update lib/mail.phpj-ed2013-01-221-2/+8
* | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2434-170/+244
* | [tx-robot] updated from transifexJenkins for ownCloud2013-01-23166-1081/+4115
* | Merge pull request #1113 from owncloud/fix-issue-1085Michael Gapczynski2013-01-226-18/+24
|\ \
| * | Make database connection error messages less verboseMichael Gapczynski2013-01-211-2/+3
| * | returning http status code 503 in case connecting to the database failedThomas Mueller2013-01-211-0/+8
| * | Merge branch 'master' into fix-issue-1085Michael Gapczynski2013-01-07148-2782/+3647
| |\ \
| * | | Move template parameters around so database error page is properly renderedMichael Gapczynski2013-01-076-18/+15
* | | | Merge pull request #1259 from TheSFReader/masterThomas Müller2013-01-221-0/+2
|\ \ \ \
| * | | | Add ebook specific mimetypesTheSFReader2013-01-171-1/+0
| * | | | Add ebook specific mimetypesTheSFReader2013-01-171-0/+3
* | | | | Merge pull request #1237 from owncloud/fix-template-testsicewind19912013-01-221-4/+0
|\ \ \ \ \
| * | | | | Remove unnecessary ob_end_clean() from template testsMichael Gapczynski2013-01-191-4/+0
* | | | | | Merge pull request #1105 from owncloud/files_encryptionSam Tuke2013-01-2238-793/+4118
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch 'master' into files_encryptionSam Tuke2013-01-22740-9271/+9056
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1255 from owncloud/leftcontent_fixicewind19912013-01-211-1/+1
|\ \ \ \ \ \
| * | | | | | Fix scrolling of leftcontentRobin Appelman2013-01-211-1/+1
* | | | | | | enable unittesting on appframework and apptemplateadvancedThomas Mueller2013-01-211-1/+2
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2148-121/+173
* | | | | | Merge pull request #1247 from owncloud/clear-queries-cache-on-schema-change-m...Thomas Müller2013-01-201-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | cached queries need to be reset on schema change because they become invalidThomas Mueller2013-01-201-0/+3
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-20150-2825/+3011