Commit Graph

1102 Commits

Author SHA1 Message Date
Jenkins for ownCloud 6bd0ba79df [tx-robot] updated from transifex 2013-08-16 01:32:30 -04:00
Jenkins for ownCloud 9492aeffe9 [tx-robot] updated from transifex 2013-08-13 09:13:11 -04:00
Jan-Christoph Borchardt 4c0ec974b9 Merge pull request #4344 from owncloud/appmgmt-in-navigation
show 'More apps' link to app administration directly in app navigation
2013-08-09 08:49:41 -07:00
Jenkins for ownCloud 98f836363a [tx-robot] updated from transifex 2013-08-09 08:06:31 -04:00
Jan-Christoph Borchardt 8652137ad6 Merge pull request #3912 from owncloud/css_cleanup_kondou
General CSS cleanup
2013-08-08 07:31:01 -07:00
Jan-Christoph Borchardt 31d50288a5 draw attention to the newly added app entry by flashing it twice 2013-08-07 21:54:28 +02:00
Jan-Christoph Borchardt 7a9daa99d1 scroll the app navigation down so the newly added app is seen 2013-08-07 21:53:53 +02:00
Jan-Christoph Borchardt 775f33cc1b prepend the new app before the 'More apps' function 2013-08-07 21:53:25 +02:00
Jan-Christoph Borchardt 367b248bc0 show 'More apps' link to app administration directly in app navigation 2013-08-07 18:18:09 +02:00
Jenkins for ownCloud 0deae7b86f [tx-robot] updated from transifex 2013-08-07 09:04:32 -04:00
Jenkins for ownCloud 9923fe655b [tx-robot] updated from transifex 2013-08-04 02:01:28 -04:00
Jenkins for ownCloud 17fe748abc [tx-robot] updated from transifex 2013-08-03 01:56:46 -04:00
Jenkins for ownCloud 16726ab793 [tx-robot] updated from transifex 2013-08-02 02:00:45 -04:00
Victor Dubiniuk 0c1008bb69 Some styling to user list 2013-08-01 19:53:41 +03:00
Jenkins for ownCloud b037f2dc6e [tx-robot] updated from transifex 2013-08-01 01:57:04 -04:00
Jenkins for ownCloud 761f40328c [tx-robot] updated from transifex 2013-07-31 02:01:45 -04:00
Jenkins for ownCloud 88e1ccbce3 [tx-robot] updated from transifex 2013-07-30 01:57:50 -04:00
Jenkins for ownCloud 0fde473cb7 [tx-robot] updated from transifex 2013-07-29 01:57:04 -04:00
Jenkins for ownCloud 48621115c1 [tx-robot] updated from transifex 2013-07-28 01:58:28 -04:00
Jenkins for ownCloud fa35650e0a [tx-robot] updated from transifex 2013-07-27 02:03:03 -04:00
kondou 92af840a51 Merge branch 'master' into css_cleanup_kondou
Conflicts:
	core/css/styles.css
	settings/templates/personal.php
2013-07-24 20:35:00 +02:00
Björn Schießle 75fd6d4fde initialize OC_Defaults in template constructorX 2013-07-24 11:51:21 +02:00
Thomas Müller 1a73e607bd Merge branch 'master' into more-themable-strings
Conflicts:
	lib/template.php
2013-07-24 09:35:33 +02:00
Jenkins for ownCloud 7bb6aab8ee [tx-robot] updated from transifex 2013-07-24 01:57:21 -04:00
Thomas Müller 840e96cda3 Merge branch 'master' into disable-anon-upload-master
Conflicts:
	settings/templates/admin.php
2013-07-22 11:55:20 +02:00
Thomas Müller 934f2e94a3 Merge branch 'master' into disable-anon-upload-master 2013-07-22 11:36:52 +02:00
Morris Jobke 342a54bf7b Merge pull request #2980 from owncloud/===_and_!==_in_settings
Use !== and === in settings.
2013-07-22 02:32:40 -07:00
Jenkins for ownCloud 01f3f8e0cc [tx-robot] updated from transifex 2013-07-22 02:03:23 -04:00
kondou 05084e03a0 Use !== and === in settings. 2013-07-21 13:55:25 +02:00
Jenkins for ownCloud 9a13b687cc [tx-robot] updated from transifex 2013-07-21 02:02:41 -04:00
Jenkins for ownCloud ae82f7fd17 [tx-robot] updated from transifex 2013-07-19 02:03:14 -04:00
Jenkins for ownCloud 279a71acb3 [tx-robot] updated from transifex 2013-07-18 02:02:51 -04:00
Jenkins for ownCloud a8acbfdf7b [tx-robot] updated from transifex 2013-07-16 02:06:21 -04:00
Thomas Müller 2964027cad Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into disable-anon-upload-master 2013-07-14 22:00:42 +02:00
Thomas Müller 79d23463f8 No admin option to enable public upload in case encryption is enabled
No upload on pubic page if public upload is disabled
2013-07-14 21:58:08 +02:00
rolandgeider 995feea42a Use transifex.com on link to translations 2013-07-14 11:54:39 +02:00
Jenkins for ownCloud 29d8ae2f95 [tx-robot] updated from transifex 2013-07-14 02:10:41 +02:00
Jenkins for ownCloud 583addaea1 [tx-robot] updated from transifex 2013-07-13 02:07:35 +02:00
Thomas Mueller 7a44d45714 change anonymous to public 2013-07-12 21:34:38 +02:00
Thomas Müller fc2d538311 new admin setting added which allows to turn off anonymous uploads 2013-07-12 17:03:51 +02:00
Jenkins for ownCloud 3fbf7ab189 [tx-robot] updated from transifex 2013-07-12 02:12:25 +02:00
Jan-Christoph Borchardt 7741ca0bcc use themable strings for admin page, simplify admin export, fix rest of #3791 2013-07-11 17:41:36 +02:00
Jenkins for ownCloud f74659f3f6 [tx-robot] updated from transifex 2013-07-11 02:26:22 +02:00
kondou efb707a431 Use OC instead of oc to show alert at an error.
Related to #4001
2013-07-10 04:28:54 +02:00
Jenkins for ownCloud 7ec6f3bde9 [tx-robot] updated from transifex 2013-07-10 02:20:59 +02:00
kondou 4818e0062e General CSS cleanup 2013-07-09 16:08:32 +02:00
Jenkins for ownCloud 439cad07b5 [tx-robot] updated from transifex 2013-07-09 02:12:22 +02:00
Björn Schießle 9b9ea7cd8e Merge https://github.com/owncloud/core/pull/3827
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
2013-07-08 10:07:57 +02:00
Jenkins for ownCloud 3cb4a72960 [tx-robot] updated from transifex 2013-07-08 02:09:41 +02:00
Jenkins for ownCloud 096d7674fc [tx-robot] updated from transifex 2013-07-07 02:06:06 +02:00