summaryrefslogtreecommitdiffstats
path: root/settings/templates
Commit message (Expand)AuthorAgeFilesLines
* 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
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #902 from owncloud/storage-wordingThomas Müller2012-12-281-7/+22
|\ \ \ \ \ \ \
| * | | | | | | moving logic from template to the 'controller'Thomas Müller2012-12-211-2/+2
| * | | | | | | enable translations for quota sizes 'none' and 'default'Thomas Müller2012-12-201-4/+19
| * | | | | | | change technical expression 'Quota' to simpler 'Storage'Jan-Christoph Borchardt2012-12-141-3/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | [l18n] fixing typos in source textThomas Müller2012-12-191-100/+121
* | | | | | | Merge pull request #961 from owncloud/check_localeFrank Karlitschek2012-12-191-0/+14
|\ \ \ \ \ \ \
| * | | | | | | add a check and a warning if setlocale is workingFrank Karlitschek2012-12-191-0/+14
* | | | | | | | Merge pull request #868 from owncloud/new_doc_systemFrank Karlitschek2012-12-191-33/+34
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | make it more readableFrank Karlitschek2012-12-141-3/+7
| * | | | | | | show the link to the issue tracker only for Admins as discussed with Björn a...Frank Karlitschek2012-12-131-1/+1
| * | | | | | | a bit more polish. We are getting there.Frank Karlitschek2012-12-131-2/+3
| * | | | | | | first version of the new documentation system integration.Frank Karlitschek2012-12-121-33/+29
| |/ / / / / /
* | | | | | / cleaning up the settings. standardize the format, add missing I10N and other ...Frank Karlitschek2012-12-152-16/+21
| |_|_|_|_|/ |/| | | | |
* | | | | | More style fixesBart Visscher2012-12-151-1/+1
|/ / / / /
* | | | | Check if we have an array with data. Fix #487Victor Dubiniuk2012-12-021-1/+1
* | | | | Merge pull request #330 from owncloud/check_connectionThomas Müller2012-11-091-0/+14
|\ \ \ \ \
| * | | | | add a check and a warning if the ownClodu server is not able to establish htt...Frank Karlitschek2012-11-081-0/+14
* | | | | | add credits to personal page too so that non admins can see what they run.Frank Karlitschek2012-11-081-1/+6
|/ / / / /
* | | | | Style: Remove all the dangling white spacesFelix Moeller2012-11-042-2/+2
* | | | | Checkstyle: Fix last six NewlineBeforeOpenBraceFelix Moeller2012-11-041-2/+1