summaryrefslogtreecommitdiffstats
path: root/settings/templates
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8604 from owncloud/sharing_encforce_passwordBjörn Schießle2014-05-161-2/+3
|\
| * allow admin to enforce passwords for public link sharesBjoern Schiessle2014-05-161-2/+3
* | Added app navigation for files appVincent Petry2014-05-151-6/+0
|/
* Merge pull request #8522 from owncloud/sharing_ux_improvementsBjörn Schießle2014-05-141-22/+22
|\
| * hide input field if default expire date isn't activatedBjoern Schiessle2014-05-131-22/+22
* | backup the encryption key after the encryption was disabled so that the userBjoern Schiessle2014-05-131-2/+33
|/
* typo fix, by translators on transifexVolkan Gezer2014-04-251-2/+2
* add setting to set default expire dateBjoern Schiessle2014-04-241-1/+18
* fix spelling 'Allow user ...' -> 'Allow users ...'Thomas Müller2014-04-221-1/+1
* Remove uneeded fileLukas Reschke2014-04-041-19/+0
* Merge pull request #7817 from owncloud/app-navigation-for-appsMorris Jobke2014-04-011-24/+25
|\
| * Makes #app-navigation a part of app management.raghunayyar2014-03-201-24/+25
* | replace personalblock fieldset with section div in admin and personal settingsJan-Christoph Borchardt2014-03-272-124/+112
* | Merge branch 'master' of https://github.com/owncloud/core into last_cron_logkondou2014-03-211-5/+7
|\|
| * Display admin option for public upload with encryption enabledVincent Petry2014-03-181-2/+0
| * Merge pull request #7564 from owncloud/issue/7559Vincent Petry2014-03-121-3/+7
| |\
| | * Hide QMail when not selected and hide sendmail when not available on the serverJoas Schilling2014-03-051-3/+7
* | | Use OC_Util::formatDate()kondou2014-03-121-1/+1
* | | Move cron status to the right of the headingkondou2014-03-121-18/+18
* | | Log last cron executionkondou2014-03-121-0/+17
|/ /
* / Authentification -> AuthenticationThomas Müller2014-03-111-1/+1
|/
* Merge pull request #7412 from owncloud/issue/7175Joas Schilling2014-03-051-1/+5
|\
| * Add button to send a test mail after changing the email settingsJoas Schilling2014-03-051-1/+5
* | update wording of email fieldMorris Jobke2014-03-041-1/+1
* | profile image: relabel technical 'Abort' to more widely used 'Cancel'Jan-Christoph Borchardt2014-02-281-1/+1
|/
* Merge pull request #7174 from owncloud/issue/7166Jan-Christoph Borchardt2014-02-261-0/+99
|\
| * Remove unused variables, add doc blocks and break linesJoas Schilling2014-02-261-9/+20
| * Hide SMTP options based on selected send modeJoas Schilling2014-02-261-16/+16
| * Add option to change email settings in admin sectionJoas Schilling2014-02-181-0/+88
* | Move isadmin to template and rename it to oc_isadminLukas Reschke2014-02-191-2/+0
* | do not autocapitalize fields on mobile, fix user name input. Also disable aut...Jan-Christoph Borchardt2014-02-181-4/+10
|/
* Merge pull request #6490 from owncloud/theming-for-appstemplateJan-Christoph Borchardt2014-02-051-0/+4
|\
| * use appstoreenabled config switchBjoern Schiessle2014-01-161-2/+2
| * do not show 'Add app' and 'More apps' for themed ownCloudJan-Christoph Borchardt2013-12-181-0/+4
* | Merge pull request #6927 from owncloud/enc_dont_reload_page_on_decryptMorris Jobke2014-01-271-22/+20
|\ \
| * | remove the form, it isn't needed hereBjoern Schiessle2014-01-241-22/+20
* | | prevent autofill for password change settings, prevent leak of existing passw...Jan-Christoph Borchardt2014-01-241-2/+4
|/ /
* | added website fieldBjoern Schiessle2014-01-171-3/+5
* | distinguish app links from doc linksBjoern Schiessle2014-01-171-2/+2
* | show link to app documentationBjoern Schiessle2014-01-171-0/+5
* | Indicate password strength using strengthifyMorris Jobke2014-01-151-0/+2
|/
* lower required php version to 5.3.3Frank Karlitschek2013-12-041-0/+14
* fix wordingMorris Jobke2013-11-271-1/+1
* add warning for HTTP connectionMorris Jobke2013-11-271-0/+14
* Merge pull request #6058 from owncloud/ldap2avatarblizzz2013-11-261-0/+4
|\
| * Enable user backends to provide avatar imagesArthur Schiwon2013-11-221-0/+4
* | fix typoBjoern Schiessle2013-11-251-1/+1
* | remove logic from template and fix syntax errorThomas Mueller2013-11-242-2/+2
* | replace echo with pFrank Karlitschek2013-11-242-2/+2
* | show the build number if on the daily build update channelFrank Karlitschek2013-11-242-2/+2
|/