summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* merge master into css-fixesJan-Christoph Borchardt2013-08-1678-100/+427
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-08-132-0/+8
| |
| * Merge pull request #4344 from owncloud/appmgmt-in-navigationJan-Christoph Borchardt2013-08-093-8/+22
| |\ | | | | | | show 'More apps' link to app administration directly in app navigation
| | * draw attention to the newly added app entry by flashing it twiceJan-Christoph Borchardt2013-08-071-0/+3
| | |
| | * scroll the app navigation down so the newly added app is seenJan-Christoph Borchardt2013-08-071-0/+2
| | |
| | * prepend the new app before the 'More apps' functionJan-Christoph Borchardt2013-08-071-1/+2
| | |
| | * show 'More apps' link to app administration directly in app navigationJan-Christoph Borchardt2013-08-072-7/+15
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-0973-72/+334
| | |
| * | Merge pull request #3912 from owncloud/css_cleanup_kondouJan-Christoph Borchardt2013-08-082-4/+4
| |\ \ | | | | | | | | General CSS cleanup
| | * \ Merge branch 'master' into css_cleanup_kondoukondou2013-07-2467-142/+223
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/css/styles.css settings/templates/personal.php
| | * | | General CSS cleanupkondou2013-07-092-4/+4
| | | | |
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-071-0/+10
| | |_|/ | |/| |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-041-0/+10
| | | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-032-0/+16
| | | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-021-20/+20
| | | |
| * | | Some styling to user listVictor Dubiniuk2013-08-011-0/+2
| | | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-011-0/+1
| | | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-311-0/+4
| | | |
* | | | remove table layout for background jobsJan-Christoph Borchardt2013-07-311-14/+6
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-302-0/+16
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-291-0/+10
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-283-0/+10
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-2752-318/+92
| |/ |/|
* | initialize OC_Defaults in template constructorXBjörn Schießle2013-07-242-12/+8
| |
* | Merge branch 'master' into more-themable-stringsThomas Müller2013-07-2439-78/+153
|\ \ | | | | | | | | | | | | Conflicts: lib/template.php
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-247-0/+13
| | |
| * | Merge branch 'master' into disable-anon-upload-masterThomas Müller2013-07-2218-62/+62
| |\ \ | | | | | | | | | | | | | | | | Conflicts: settings/templates/admin.php
| | * \ Merge pull request #2980 from owncloud/===_and_!==_in_settingsMorris Jobke2013-07-2218-62/+62
| | |\ \ | | | | | | | | | | Use !== and === in settings.
| | | * | Use !== and === in settings.kondou2013-07-2118-62/+62
| | | | |
| * | | | Merge branch 'master' into disable-anon-upload-masterThomas Müller2013-07-2214-16/+64
| |\| | |
| | * | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-222-12/+13
| | |/ /
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-211-0/+2
| | | |
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-191-0/+1
| | | |
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-183-2/+4
| | | |
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-163-1/+33
| | | |
| | * | Use transifex.com on link to translationsrolandgeider2013-07-141-1/+1
| | | |
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-142-0/+7
| | | |
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-132-0/+3
| | | |
| * | | 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-122-2/+11
| |/ /
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-124-1/+4
| | |
* | | use themable strings for admin page, simplify admin export, fix rest of #3791Jan-Christoph Borchardt2013-07-111-9/+15
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-117-0/+7
| |
* | Use OC instead of oc to show alert at an error.kondou2013-07-101-1/+1
| | | | | | | | Related to #4001
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-106-0/+12
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-0946-46/+0
| |
* | 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
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-081-0/+5
| |