summaryrefslogtreecommitdiffstats
path: root/settings/templates
Commit message (Collapse)AuthorAgeFilesLines
* Users page: username instead of login name as col header to avoid confusion ↵Arthur Schiwon2013-06-181-1/+1
| | | | with other backends
* Merge pull request #3687 from owncloud/template_updatesBjörn Schießle2013-06-132-7/+12
|\ | | | | Make templates aware of different owncloud editions
| * Merge branch 'template_updates' of github.com:owncloud/core into ↵Björn Schießle2013-06-122-9/+4
| |\ | | | | | | | | | template_updates
| | * 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
|\ \ | | | | | | remove App management top bar and move buttons more contextually in the interface
| * | apps management: change misleading + to ...Jan-Christoph Borchardt2013-06-121-1/+1
| | |
| * | remove App management top bar and move buttons more contextually in the ↵Jan-Christoph Borchardt2013-06-121-5/+10
| |/ | | | | | | interface
* / 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
| | | | so it should only be visible for users with a supporting backend.
* 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
| * 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
|\ \ | | | | | | Priorize common languages.
| * | Make divider not selectablekondou2013-04-191-1/+1
| | | | | | | | | | | | Very hacky
| * | Priorize common languages.kondou2013-04-181-1/+6
| |/
* | Merge pull request #3098 from jerrac/displaynamesaveontimeoutMorris Jobke2013-04-251-3/+1
|\ \ | | | | | | On the Personal Settings page, made the display name save like the email address saves
| * | Made saving the display name work the same way as the email address. Fixed a ↵David Reagan2013-04-231-3/+1
| |/ | | | | | | few comparison operators. Increased the fadeOut time for the success and error messages.
* / 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
|\ | | | | Implements Hide / Display for the Password Toggle Button
| * 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
| | | | | | Fixes #2647
* | 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
|/ | | | | * show "less" button only if there are more than 3 entries * only "remove" logs till last 3 entries
* Merge branch 'master' into fixing-bugtracker-link-masterLukas Reschke2013-03-018-194/+174
|\ | | | | | | | | | | Conflicts: core/templates/exception.php settings/templates/help.php
| * Remove uneeded OAuth filesLukas Reschke2013-02-271-20/+0
| |
| * [core] From echo to pLukas Reschke2013-02-278-176/+176
| |
* | change bug tracker links to ↵Thomas Mueller2013-03-011-1/+1
|/ | | | https://github.com/owncloud/core/blob/master/CONTRIBUTING.md
* fixes 1933 - the locale name is no longer part of the translation stringThomas Mueller2013-02-271-1/+4
|
* Join split translated stringsBart Visscher2013-02-211-4/+1
|
* Style cleanup settingsBart Visscher2013-02-213-20/+41
|
* Correct new password input nameVictor Dubiniuk2013-02-181-1/+1
|
* fix user delete button not showing in IE, another SVG replacement issueJan-Christoph Borchardt2013-02-141-1/+1
|
* Merge pull request #1624 from owncloud/singleselectFrank Karlitschek2013-02-121-33/+29
|\ | | | | Split editable select code used for quota selection into a jquery plugin
| * Split editable select code used for quota selection into a jquery pluginRobin Appelman2013-02-111-33/+29
| |
* | move CSS to correct location, move and format phpJan-Christoph Borchardt2013-02-111-9/+3
| |
* | spaces to tabsJan-Christoph Borchardt2013-02-111-10/+10
| |
* | correct target blank from image to linkJan-Christoph Borchardt2013-02-111-6/+6
| |
* | add in new windowFrank Karlitschek2013-02-091-3/+3
| |
* | add the buttons for the clients to the personal page.Frank Karlitschek2013-02-091-6/+25
|/ | | | Useful and prettier
* Merge pull request #1552 from raghunayyar/personalpage-style-fixBjörn Schießle2013-02-101-2/+2
|\ | | | | Personal Page Password Toggle Loads Fine.
| * Personal Page Password Toggle Also Loads Well.raghunayyar2013-02-091-2/+2
| |
* | 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-8
| * | 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 the iframe height and width fix from js to css