summaryrefslogtreecommitdiffstats
path: root/settings/templates
Commit message (Expand)AuthorAgeFilesLines
* initialize OC_Defaults in template constructorXBjörn Schießle2013-07-242-12/+8
* Merge branch 'master' into more-themable-stringsThomas Müller2013-07-243-16/+26
|\
| * Merge branch 'master' into disable-anon-upload-masterThomas Müller2013-07-222-16/+16
| |\
| | * Use !== and === in settings.kondou2013-07-212-16/+16
| * | Merge branch 'master' into disable-anon-upload-masterThomas Müller2013-07-221-1/+1
| |\|
| | * Use transifex.com on link to translationsrolandgeider2013-07-141-1/+1
| * | Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into di...Thomas Müller2013-07-141-2/+2
| |\ \
| | * | change anonymous to publicThomas Mueller2013-07-121-2/+2
| * | | No admin option to enable public upload in case encryption is enabledThomas Müller2013-07-141-0/+2
| |/ /
| * / new admin setting added which allows to turn off anonymous uploadsThomas Müller2013-07-121-1/+9
| |/
* / use themable strings for admin page, simplify admin export, fix rest of #3791Jan-Christoph Borchardt2013-07-111-9/+15
|/
* Merge https://github.com/owncloud/core/pull/3827Björn Schießle2013-07-081-1/+1
* revert changes which where introduced by accident during merge https://github...Björn Schießle2013-07-041-2/+3
* move to non-static OC_DefaultsBjörn Schießle2013-07-042-6/+6
* Add init funtion to OC_Defaults to be able to wrap translatable stringsBjörn Schießle2013-07-042-0/+3
* Merge pull request #3894 from owncloud/ie8_compatibility_fixesThomas Müller2013-07-011-1/+1
|\
| * Hide a ghost image on the apps management pageVictor Dubiniuk2013-06-281-1/+1
* | check for updates only in the community editionBjörn Schießle2013-07-011-1/+1
* | construct the foother in defaults.php so that we use always the same footerBjörn Schießle2013-07-012-11/+17
|/
* Users page: username instead of login name as col header to avoid confusion w...Arthur Schiwon2013-06-181-1/+1
* Merge pull request #3687 from owncloud/template_updatesBjörn Schießle2013-06-132-7/+12
|\
| * Merge branch 'template_updates' of github.com:owncloud/core into template_upd...Björn Schießle2013-06-122-9/+4
| |\
| | * move common settings footer fieldset out of conditionalJan-Christoph Borchardt2013-06-122-9/+4
| * | don't show translation hints in enterprise editionBjörn Schießle2013-06-121-0/+2
| |/
| * make footer and urls aware of ownCloud editionsBjörn Schießle2013-06-122-4/+12
* | Merge pull request #3677 from owncloud/apps-buttonsJan-Christoph Borchardt2013-06-131-5/+10
|\ \
| * | apps management: change misleading + to ...Jan-Christoph Borchardt2013-06-121-1/+1
| * | remove App management top bar and move buttons more contextually in the inter...Jan-Christoph Borchardt2013-06-121-5/+10
| |/
* / move storage bar below clients showcase to make it more visibleJan-Christoph Borchardt2013-06-111-6/+9
|/
* add hint about what the recovery password field is forBjörn Schießle2013-06-061-1/+5
* The "lost password" field depends on OC_USER_BACKEND_SET_PASSWORDzafi2013-05-251-0/+6
* allow admin to recover users files in case of password lostBjörn Schießle2013-05-162-1/+6
* fix inconsistent post parameters in change password operationBjörn Schießle2013-05-081-1/+1
* Merge pull request #3114 from owncloud/update-notificationRaghu Nayyar2013-04-261-2/+1
|\
| * Add an update notification on every page for admin usersLukas Reschke2013-04-241-2/+1
* | Merge pull request #3002 from owncloud/priorize_common_languagesBart Visscher2013-04-261-1/+6
|\ \
| * | Make divider not selectablekondou2013-04-191-1/+1
| * | Priorize common languages.kondou2013-04-181-1/+6
| |/
* | Merge pull request #3098 from jerrac/displaynamesaveontimeoutMorris Jobke2013-04-251-3/+1
|\ \
| * | Made saving the display name work the same way as the email address. Fixed a ...David Reagan2013-04-231-3/+1
| |/
* / Fix #3095.kondou2013-04-241-9/+3
|/
* also adjust template properly for log date fixBernhard Posselt2013-04-171-1/+5
* Merge pull request #2554 from owncloud/hide-toggle-checkboxBernhard Posselt2013-04-111-1/+1
|\
| * New Password in Personal Password Page loads fine.raghunayyar2013-04-111-1/+1
* | Users: fix "Other.." quota option for the default quotaRobin Appelman2013-04-091-1/+1
* | Unescape the update hintLukas Reschke2013-04-021-1/+1
* | apply code review hintsMorris Jobke2013-03-281-3/+3
* | Make it possible to show less log entries again - fix owncloud/core#1593Morris Jobke2013-03-271-0/+1
|/
* Merge branch 'master' into fixing-bugtracker-link-masterLukas Reschke2013-03-018-194/+174
|\
| * Remove uneeded OAuth filesLukas Reschke2013-02-271-20/+0