summaryrefslogtreecommitdiffstats
path: root/settings/templates
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4563 from owncloud/use_personal-passwordJan-Christoph Borchardt2013-08-281-1/+1
|\ | | | | Use personal-password for the password name in personal.php
| * Use personal-password for the password name in personal.phpkondou2013-08-241-1/+1
| | | | | | | | Fix #4491
* | Merge branch 'master' into improve_app-managementkondou2013-08-212-3/+29
|\| | | | | | | | | Conflicts: settings/js/apps.js
| * Merge pull request #4447 from owncloud/fix_4351_masterMorris Jobke2013-08-201-3/+3
| |\ | | | | | | Use JSON to send/receive group data.
| | * Use JSON to send/receive group data.Owen Winkler2013-08-151-3/+3
| | | | | | | | | | | | Squashed commits from PR #4364 for master.
| * | Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-172-16/+8
| |\ \ | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php
| * | | working decrypt files methodBjoern Schiessle2013-07-291-1/+9
| | | |
| * | | user interface to allow user to decrypt all his files once the encryption ↵Björn Schießle2013-07-291-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | app was disabled Conflicts: settings/templates/personal.php
* | | | Move .errormsg from settings-css to .warning in core. Reusable!kondou2013-08-181-1/+1
| | | |
* | | | Don't use an alert for displaying app-mgmt-errorskondou2013-08-181-0/+1
| |/ / |/| | | | | | | | | | | | | | Rather display a dominant div and mark the problematic app in the applist. Fix #305
* | | merge master into css-fixesJan-Christoph Borchardt2013-08-161-2/+2
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into css_cleanup_kondoukondou2013-07-243-33/+45
| |\| | | | | | | | | | | | | | | | Conflicts: core/css/styles.css settings/templates/personal.php
| * | General CSS cleanupkondou2013-07-091-2/+2
| | |
* | | remove table layout for background jobsJan-Christoph Borchardt2013-07-311-14/+6
| |/ |/|
* | 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
|\ \ | | | | | | | | | | | | Conflicts: lib/template.php
| * \ Merge branch 'master' into disable-anon-upload-masterThomas Müller2013-07-222-16/+16
| |\ \ | | | | | | | | | | | | | | | | Conflicts: settings/templates/admin.php
| | * | 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 ↵Thomas Müller2013-07-141-2/+2
| |\ \ \ | | | | | | | | | | | | | | | disable-anon-upload-master
| | * | | 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
| |/ / / | | | | | | | | | | | | No upload on pubic page if public upload is disabled
| * / / 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
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit eed4b49cebcbcc252a75ed85097730b73213b0da Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 8 10:03:23 2013 +0200 initialize OC_Defaults only once commit bf6f07ccc8fb87535a069ca341789a590cb187ee Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 8 10:02:48 2013 +0200 link to doc in error messages commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2 Merge: e41af3d 3c1308f Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jul 4 11:10:56 2013 +0200 Merge branch 'master' into better-messages commit e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jul 4 11:10:41 2013 +0200 move to non-static defaults.php commit 9e4258b1905244bdf34943a825421f041cbed43d Author: Björn Schießle <schiessle@owncloud.com> Date: Tue Jul 2 10:32:13 2013 +0200 no sprintf here, lets t() handle it commit fe1df349e248667a137f70d78b04225e5b42a111 Merge: d8f6859 cb5811b Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 1 11:13:38 2013 +0200 Merge branch 'master' into better-messages commit d8f68595df2dc0e0917d916cbde511ec5333010b Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 1 11:10:57 2013 +0200 use document base url from defaults.php commit 6c5403748a45717125a2aa375550f05646317d72 Merge: bea6b1c 7b0e3e6 Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 1 11:00:15 2013 +0200 Merge branch 'master' into better-messages commit bea6b1c8a0968846065b9153e0a3f46a4e3245ee Author: Jan-Christoph Borchardt <hey@jancborchardt.net> Date: Mon Jun 24 16:21:12 2013 +0200 link to docs in WebDAV message, ref #3791 commit 3119b364a1094769e711283d1ce9014505f64ab9 Author: Jan-Christoph Borchardt <hey@jancborchardt.net> Date: Mon Jun 24 16:10:21 2013 +0200 link to docs in error messages, fix #3819
* revert changes which where introduced by accident during merge ↵Björn Schießle2013-07-041-2/+3
| | | | https://github.com/owncloud/core/commit/23cc69b816f5df465c7c9d0df5630d00abfaf6d0
* move to non-static OC_DefaultsBjörn Schießle2013-07-042-6/+6
| | | | | | Conflicts: lib/mail.php
* 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
|\ | | | | Ie8 compatibility fixes
| * 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
|/ | | | | | Conflicts: settings/templates/admin.php
* 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.
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-23 05:49:35 +0000