summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-0258-4/+166
* Merge pull request #1404 from owncloud/fixing-1276-masterblizzz2013-02-011-3/+4
|\
| * fix #1276 - use registerLoadedCallback()Thomas Mueller2013-02-011-3/+4
* | Updateing -> UpdatingThomas Mueller2013-02-011-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-012-0/+8
|/
* Merge pull request #1351 from owncloud/navigationMichael Gapczynski2013-01-3112-268/+87
|\
| * Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-3114-20/+99
| |\
| * \ Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-3111-22/+57
| |\ \
| * \ \ Merge pull request #1359 from raghunayyar/navigationJan-Christoph Borchardt2013-01-311-4/+4
| |\ \ \
| | * | | Shorter, Cleaner JS in apps.jsraghunayyar2013-01-311-8/+4
| | * | | Reduced Styling and Image loads as from src and not backgorund.raghunayyar2013-01-301-1/+2
| | * | | No Image Repetition on Enabling Apps in Navigation Barraghunayyar2013-01-301-1/+4
| * | | | Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-3063-69/+95
| |\ \ \ \
| * \ \ \ \ merge stylesJan-Christoph Borchardt2013-01-2822-150/+139
| |\ \ \ \ \
| * \ \ \ \ \ merge changes in navigationJan-Christoph Borchardt2013-01-281-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Defined height for #leftcontentraghunayyar2013-01-251-1/+1
| * | | | | | fix up content and content-wrapper merge ...Jan-Christoph Borchardt2013-01-187-177/+179
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | new settings menu for new designJan-Christoph Borchardt2013-01-1710-263/+82
* | | | | | | 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