Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge master into css-fixes | Jan-Christoph Borchardt | 2013-08-16 | 78 | -100/+427 |
|\ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-13 | 2 | -0/+8 |
| | | |||||
| * | Merge pull request #4344 from owncloud/appmgmt-in-navigation | Jan-Christoph Borchardt | 2013-08-09 | 3 | -8/+22 |
| |\ | | | | | | | show 'More apps' link to app administration directly in app navigation | ||||
| | * | draw attention to the newly added app entry by flashing it twice | Jan-Christoph Borchardt | 2013-08-07 | 1 | -0/+3 |
| | | | |||||
| | * | scroll the app navigation down so the newly added app is seen | Jan-Christoph Borchardt | 2013-08-07 | 1 | -0/+2 |
| | | | |||||
| | * | prepend the new app before the 'More apps' function | Jan-Christoph Borchardt | 2013-08-07 | 1 | -1/+2 |
| | | | |||||
| | * | show 'More apps' link to app administration directly in app navigation | Jan-Christoph Borchardt | 2013-08-07 | 2 | -7/+15 |
| | | | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-09 | 73 | -72/+334 |
| | | | |||||
| * | | Merge pull request #3912 from owncloud/css_cleanup_kondou | Jan-Christoph Borchardt | 2013-08-08 | 2 | -4/+4 |
| |\ \ | | | | | | | | | General CSS cleanup | ||||
| | * \ | Merge branch 'master' into css_cleanup_kondou | kondou | 2013-07-24 | 67 | -142/+223 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/css/styles.css settings/templates/personal.php | ||||
| | * | | | General CSS cleanup | kondou | 2013-07-09 | 2 | -4/+4 |
| | | | | | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-07 | 1 | -0/+10 |
| | |_|/ | |/| | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-04 | 1 | -0/+10 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-03 | 2 | -0/+16 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-02 | 1 | -20/+20 |
| | | | | |||||
| * | | | Some styling to user list | Victor Dubiniuk | 2013-08-01 | 1 | -0/+2 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-01 | 1 | -0/+1 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-31 | 1 | -0/+4 |
| | | | | |||||
* | | | | remove table layout for background jobs | Jan-Christoph Borchardt | 2013-07-31 | 1 | -14/+6 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-30 | 2 | -0/+16 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-29 | 1 | -0/+10 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-28 | 3 | -0/+10 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-27 | 52 | -318/+92 |
| |/ |/| | |||||
* | | initialize OC_Defaults in template constructorX | Björn Schießle | 2013-07-24 | 2 | -12/+8 |
| | | |||||
* | | Merge branch 'master' into more-themable-strings | Thomas Müller | 2013-07-24 | 39 | -78/+153 |
|\ \ | | | | | | | | | | | | | Conflicts: lib/template.php | ||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-24 | 7 | -0/+13 |
| | | | |||||
| * | | Merge branch 'master' into disable-anon-upload-master | Thomas Müller | 2013-07-22 | 18 | -62/+62 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: settings/templates/admin.php | ||||
| | * \ | Merge pull request #2980 from owncloud/===_and_!==_in_settings | Morris Jobke | 2013-07-22 | 18 | -62/+62 |
| | |\ \ | | | | | | | | | | | Use !== and === in settings. | ||||
| | | * | | Use !== and === in settings. | kondou | 2013-07-21 | 18 | -62/+62 |
| | | | | | |||||
| * | | | | Merge branch 'master' into disable-anon-upload-master | Thomas Müller | 2013-07-22 | 14 | -16/+64 |
| |\| | | | |||||
| | * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-22 | 2 | -12/+13 |
| | |/ / | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-21 | 1 | -0/+2 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-19 | 1 | -0/+1 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-18 | 3 | -2/+4 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-16 | 3 | -1/+33 |
| | | | | |||||
| | * | | Use transifex.com on link to translations | rolandgeider | 2013-07-14 | 1 | -1/+1 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-14 | 2 | -0/+7 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-13 | 2 | -0/+3 |
| | | | | |||||
| * | | | Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into ↵ | Thomas Müller | 2013-07-14 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | disable-anon-upload-master | ||||
| | * | | | change anonymous to public | Thomas Mueller | 2013-07-12 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | No admin option to enable public upload in case encryption is enabled | Thomas Müller | 2013-07-14 | 1 | -0/+2 |
| |/ / / | | | | | | | | | | | | | No upload on pubic page if public upload is disabled | ||||
| * / / | new admin setting added which allows to turn off anonymous uploads | Thomas Müller | 2013-07-12 | 2 | -2/+11 |
| |/ / | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-12 | 4 | -1/+4 |
| | | | |||||
* | | | use themable strings for admin page, simplify admin export, fix rest of #3791 | Jan-Christoph Borchardt | 2013-07-11 | 1 | -9/+15 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-11 | 7 | -0/+7 |
| | | |||||
* | | Use OC instead of oc to show alert at an error. | kondou | 2013-07-10 | 1 | -1/+1 |
| | | | | | | | | Related to #4001 | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-10 | 6 | -0/+12 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-09 | 46 | -46/+0 |
| | | |||||
* | | Merge https://github.com/owncloud/core/pull/3827 | Björn Schießle | 2013-07-08 | 1 | -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 transifex | Jenkins for ownCloud | 2013-07-08 | 1 | -0/+5 |
| | |