aboutsummaryrefslogtreecommitdiffstats
path: root/settings/templates
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1543 from owncloud/utf8-locale-masterThomas Müller2013-02-091-1/+1
|\
| * some systems use en_US.UTF8 instead of en_US.UTF-8Thomas Müller2013-02-081-1/+1
* | Merge pull request #1561 from Raydiation/masterJörn Friedrich Dreyer2013-02-091-2/+3
|\ \
| * | moved iframe height and width fix from js to cssBernhard Posselt2013-02-091-2/+3
| |/
* | Revert "moved iframe height and width fix from js to css"Bernhard Posselt2013-02-091-3/+2
* | moved iframe height and width fix from js to cssBernhard Posselt2013-02-091-2/+3
* | Merge branch 'master' into fixing-1354-masterThomas Mueller2013-02-074-5/+36
|\|
| * Merge pull request #1443 from owncloud/use-module-file-info-masterLukas Reschke2013-02-061-1/+14
| |\
| | * we get best results regarding mime type detection if we use fileinfo - let's ...Thomas Mueller2013-02-041-1/+14
| * | Merge pull request #1428 from owncloud/content_positioningThomas Tanghus2013-02-062-2/+2
| |\ \
| | * | Add 'hascontrols' class for content with fixed topbar.Thomas Tanghus2013-02-042-2/+2
| | |/
| * | make it possible to modify the links to the clientsGeorg Ehrke2013-02-061-3/+3
| * | let the user change his display name, if supported by the back-endBjörn Schießle2013-02-061-0/+17
* | | show webdav test results in admin section as wellThomas Mueller2013-02-071-0/+15
|/ /
* / offer change password only when the action is supported by the user backendArthur Schiwon2013-02-051-1/+6
|/
* Merge pull request #1379 from owncloud/improved_appsmanagementLukas Reschke2013-01-311-3/+4
|\
| * remove leftover codeFrank Karlitschek2013-01-301-3/+0
| * merge masterFrank Karlitschek2013-01-305-197/+180
| |\
| * | mark recommended apps. server part not yet fully implementedFrank Karlitschek2013-01-301-2/+1
| * | we are getting closer. updating is not working yet.Frank Karlitschek2013-01-211-1/+3
* | | make strings translatableBjörn Schießle2013-01-301-2/+2
| |/ |/|
* | Merge pull request #1360 from owncloud/display_nameLukas Reschke2013-01-291-3/+9
|\ \
| * | rename Name to Login NameBjörn Schießle2013-01-281-2/+2
| * | show display name in input fieldBjörn Schießle2013-01-281-1/+2
| * | interface and API to change display namesBjörn Schießle2013-01-281-1/+1
| * | prepare user table to show and edit display namesBjörn Schießle2013-01-281-1/+6
| * | compare the correct uidsBjörn Schießle2013-01-251-1/+1
* | | Merge pull request #1059 from owncloud/fixing-998-masterThomas Müller2013-01-261-2/+0
|\ \ \
| * | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-185-145/+172
| |\| |
| * | | displaying notification now centeredThomas Mueller2013-01-111-2/+0
* | | | Move appid to external fileLukas Reschke2013-01-231-1/+2
* | | | Remove uneeded JSLukas Reschke2013-01-221-22/+1
* | | | External JSON for the AppsLukas Reschke2013-01-211-7/+3
* | | | Move isadmin to external fileLukas Reschke2013-01-211-3/+3
| |/ / |/| |
* | | Spaces to tabsBart Visscher2013-01-165-169/+169
* | | Merge branch 'master' into fixing-unused-and-undefined-in-masterThomas Mueller2013-01-141-0/+27
|\ \ \ | | |/ | |/|
| * | Removed uneeded HTML tagLukas Reschke2013-01-111-1/+1
| * | Add security section to admin menuLukas Reschke2013-01-111-0/+27
| |/
* / fixing <input> tagThomas Mueller2013-01-071-1/+1
|/
* Merge pull request #1053 from owncloud/ocs_apiMichael Gapczynski2013-01-042-0/+39
|\
| * Merge branch 'master' into ocs_apiTom Needham2012-12-314-151/+207
| |\
| * \ Merge branch 'master' into ocs_apiTom Needham2012-12-161-1/+1
| |\ \
| * \ \ Merge master into ocs_api, fix conflicts.Tom Needham2012-12-145-8/+26
| |\ \ \
| * \ \ \ Merge master into ocs_apiTom Needham2012-10-282-3/+5
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into ocs_apiTom Needham2012-09-171-7/+26
| |\ \ \ \ \
| * \ \ \ \ \ Fix merge conflictsTom Needham2012-09-136-37/+118
| |\ \ \ \ \ \
| * | | | | | | Check if required apps are installedTom Needham2012-07-302-3/+22
| * | | | | | | Improve styling of permission request pageTom Needham2012-07-301-12/+13
| * | | | | | | Basic template for authorising exernal apps with OAuthTom Needham2012-07-301-0/+19
* | | | | | | | omit type attribute in script tag to use fallback (text/javascript)Jörn Friedrich Dreyer2013-01-021-1/+1
| |_|_|_|_|_|/ |/| | | | | |