summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* remove z-index from app labels which caused overlap with top barJan-Christoph Borchardt2013-01-311-2/+2
* Sort internal apps above 3rdparty appsRobin Appelman2013-01-311-0/+4
* Merge pull request #1379 from owncloud/improved_appsmanagementLukas Reschke2013-01-317-8/+68
|\
| * update on translation stringThomas Mueller2013-01-311-1/+1
| * l10n support for the error dialog addedThomas Mueller2013-01-311-1/+1
| * Cleanup string - easier for translatorsThomas Mueller2013-01-311-1/+1
| * remove leftover codeFrank Karlitschek2013-01-301-3/+0
| * fix typoFrank Karlitschek2013-01-301-1/+1
| * merge masterFrank Karlitschek2013-01-3079-410/+423
| |\
| * | mark recommended apps. server part not yet fully implementedFrank Karlitschek2013-01-304-3/+12
| * | we are getting closer. updating is not working yet.Frank Karlitschek2013-01-216-2/+57
* | | Merge pull request #1387 from schiesbn/visual_improvementsThomas Müller2013-01-311-5/+5
|\ \ \
| * | | addapt the css to adjust the change display name filed to the set password fieldBjörn Schießle2013-01-311-5/+5
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-317-7/+22
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-3110-20/+55
|/ / /
* | / make strings translatableBjörn Schießle2013-01-301-2/+2
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2013-01-3058-59/+7
* | Merge pull request #1360 from owncloud/display_nameLukas Reschke2013-01-295-10/+88
|\ \
| * | only change display name if the display name from the current user was change...Björn Schießle2013-01-291-0/+2
| * | 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
| * | fix typo in variable nameBjörn Schießle2013-01-291-1/+1
| * | 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
| * | interface and API to change display namesBjörn Schießle2013-01-283-1/+40
| * | prepare user table to show and edit display namesBjörn Schießle2013-01-282-4/+9
| * | typo fixedBjörn Schießle2013-01-251-1/+1
| * | 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-251-1/+1
| * | get all display namesBjörn Schießle2013-01-251-5/+10
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-281-0/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-272-2/+2
* | | Merge pull request #1059 from owncloud/fixing-998-masterThomas Müller2013-01-263-22/+11
|\ \ \
| * \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-1879-305/+317
| |\ \ \
| * | | | displaying notification now centeredThomas Mueller2013-01-111-2/+0
| * | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-1110-50/+105
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-064-0/+141
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-065-1/+59
| |\ \ \ \ \ \
| * | | | | | | javascript syntax error fixed on the wayThomas Mueller2013-01-041-3/+3
| * | | | | | | new javascript notification functions used within users.jsThomas Mueller2013-01-041-5/+4
| * | | | | | | moving storage calculation code to OC_Helper::getStorageInfo()Thomas Mueller2013-01-021-12/+4
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-261-0/+3
* | | | | | | | Merge branch 'master' into no-inline-jsLukas Reschke2013-01-251-0/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-251-0/+15
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge master...Lukas Reschke2013-01-231-0/+17
|\| | | | | | |
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-231-0/+17
* | | | | | | | Move appid to external fileLukas Reschke2013-01-233-4/+5
* | | | | | | | Remove uneeded JSLukas Reschke2013-01-221-22/+1