summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge masterFrank Karlitschek2013-01-301095-23861/+47762
|\
| * Merge pull request #1227 from owncloud/hideuploadprogresscancelinielt10Thomas Müller2013-01-301-0/+4
| |\
| | * hide upload progress bar and cancel action in IE < 10Jörn Friedrich Dreyer2013-01-181-0/+4
| * | Merge pull request #1308 from TheSFReader/masterJörn Friedrich Dreyer2013-01-301-5/+2
| |\ \
| | * \ Merge remote-tracking branch 'refs/remotes/upstream/master'TheSFReader2013-01-2685-1908/+16943
| | |\ \
| | * \ \ Merge remote-tracking branch 'refs/remotes/upstream/master'TheSFReader2013-01-25528-6982/+14275
| | |\ \ \
| | * | | | Simplify the code and remove a first unnecessary (and non conform) '&' chara...TheSFReader2013-01-251-5/+2
| * | | | | LDAP: update quota on every uncached userExists, i.e. also on every isLoggedI...Arthur Schiwon2013-01-301-0/+1
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-30245-3605/+4445
| * | | | | Merge pull request #1360 from owncloud/display_nameLukas Reschke2013-01-2922-33/+440
| |\ \ \ \ \
| | * | | | | only change display name if the display name from the current user was change...Björn Schießle2013-01-292-1/+5
| | * | | | | prevent xssBjörn Schießle2013-01-291-1/+1
| | * | | | | remove debug outputBjörn Schießle2013-01-291-3/+0
| | * | | | | check permissions before changing the display nameBjörn Schießle2013-01-291-0/+13
| | * | | | | added missing changedisplayname.phpBjörn Schießle2013-01-291-0/+15
| | * | | | | remove dubug outputBjörn Schießle2013-01-291-1/+0
| | * | | | | version dump to trigger db updateBjörn Schießle2013-01-291-1/+1
| | * | | | | fix typo in variable nameBjörn Schießle2013-01-291-1/+1
| | * | | | | 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 #1352 from mjkent/masterLukas Reschke2013-01-291-0/+2
| |\ \ \ \ \ \
| | * | | | | | Add robot.txtMichael Kent2013-01-281-0/+2
| * | | | | | | Merge pull request #1324 from owncloud/permanent-share-iconsMichael Gapczynski2013-01-283-6/+23
| |\ \ \ \ \ \ \
| | * | | | | | | Change file action text for files inside shared folders as wellMichael Gapczynski2013-01-281-0/+1
| | * | | | | | | Change file action text to 'Shared'Michael Gapczynski2013-01-281-0/+3
| | * | | | | | | fix color change on clickJan-Christoph Borchardt2013-01-281-1/+1
| | * | | | | | | Merge branch 'master' into permanent-share-iconsJan-Christoph Borchardt2013-01-28189-4746/+5319
| | |\| | | | | |
| | * | | | | | | Permanently display shared status iconsMichael Gapczynski2013-01-262-5/+18
| | | |_|_|_|/ / | | |/| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-03 02:58:52 +0000