Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3920 from owncloud/Fixing_search_ie8 | Jörn Friedrich Dreyer | 2013-07-09 | 1 | -2/+6 |
|\ | | | | | [ie8] Fix lazy CSS loading and missing borders in search dropdown | ||||
| * | Fix lazy styles loading in IE8 | Victor Dubiniuk | 2013-07-02 | 1 | -2/+6 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-09 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #3963 from owncloud/update-logic-split | icewind1991 | 2013-07-08 | 1 | -107/+28 |
|\ \ | | | | | | | Move the upgrade logic to \OC\Updater | ||||
| * | | split upgrade logic from ajax file | Robin Appelman | 2013-07-06 | 1 | -107/+28 |
| | | | |||||
* | | | Merge pull request #3757 from owncloud/icon-cleanup | Jan-Christoph Borchardt | 2013-07-08 | 16 | -25/+23 |
|\ \ \ | | | | | | | | | Icon cleanup | ||||
| * | | | change delete from entry forbidden sign to proper icon | Jan-Christoph Borchardt | 2013-07-05 | 2 | -3/+10 |
| | | | | |||||
| * | | | Optimize pictures with optipng and scour | kondou | 2013-06-21 | 5 | -217/+9 |
| | | | | |||||
| * | | | standardize on 32px loading spinner, decrease size in CSS where needed | Jan-Christoph Borchardt | 2013-06-17 | 3 | -0/+7 |
| | | | | |||||
| * | | | use proper style for add icon | Jan-Christoph Borchardt | 2013-06-17 | 2 | -8/+60 |
| | | | | |||||
| * | | | remove unused loading spinners, just have one | Jan-Christoph Borchardt | 2013-06-17 | 2 | -0/+0 |
| | | | | |||||
| * | | | remove unused big images | Jan-Christoph Borchardt | 2013-06-17 | 2 | -0/+0 |
| | | | | |||||
| * | | | use mail icon consistent with Mail app icon | Jan-Christoph Borchardt | 2013-06-17 | 2 | -6/+94 |
| | | | | |||||
| * | | | transparent background for lock icon | Jan-Christoph Borchardt | 2013-06-17 | 1 | -0/+0 |
| | | | | |||||
| * | | | use consistent icon for 'restore'/versions/history, also SVG | Jan-Christoph Borchardt | 2013-06-17 | 1 | -0/+0 |
| | | | | |||||
| * | | | differentiate delete from close icon | Jan-Christoph Borchardt | 2013-06-17 | 5 | -11/+63 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-07 | 3 | -0/+12 |
| |/ / |/| | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-06 | 62 | -63/+8 |
| | | | |||||
* | | | fixing === and ident | Thomas Müller | 2013-07-05 | 1 | -6/+6 |
| | | | |||||
* | | | Merge branch 'master' into fixing-3934-master | Thomas Müller | 2013-07-05 | 3 | -13/+13 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: core/js/share.js | ||||
| * | | | no anonymous upload on read-only folders | Thomas Müller | 2013-07-05 | 1 | -9/+11 |
| | | | | |||||
| * | | | Merge https://github.com/owncloud/core/pull/3900 | Björn Schießle | 2013-07-05 | 2 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit a34098427720c2d0470367cd9698c184d85b8dfd Merge: ccf849b 955646c Author: Björn Schießle <schiessle@owncloud.com> Date: Fri Jul 5 09:59:29 2013 +0200 Merge branch 'master' into theme_aware_mail_footer commit ccf849bc6f18d80cdb593e851529b87579fe072b Merge: 8d5fb70 3c1308f Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jul 4 11:03:47 2013 +0200 Merge branch 'master' into theme_aware_mail_footer commit 8d5fb70e6dcb2e2e34dcdf2a883680ef034afeea Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jul 4 10:38:39 2013 +0200 switch to non-static defaults.php commit 88ab2768dcc4ced12c48872c887baa94ad938d62 Merge: e199df8 84c25f9 Author: Björn Schießle <schiessle@owncloud.com> Date: Wed Jul 3 16:59:48 2013 +0200 Merge branch 'theme_aware_mail_footer' of github.com:owncloud/core into theme_aware_mail_footer Conflicts: core/templates/altmail.php commit e199df844b5faf80a36d8380a5b0b58025cd425f Author: Björn Schießle <schiessle@owncloud.com> Date: Wed Jul 3 16:56:29 2013 +0200 name and slogan should be in one line commit 84c25f9853e1bfbe4ae780371b1353aafb6b15c2 Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Mon Jul 1 21:15:35 2013 +0200 no ?> at the end of a file commit 3bd8d38d011f62ce78bcd0c108eb8cf2ce97eb99 Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 1 12:58:36 2013 +0200 print url unescaped commit d304ed18c8b7350e92e24565b9b9ba77b519d74c Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 1 12:56:05 2013 +0200 make new mail templates aware of different ownCloud themes | ||||
* | | | | no anonymous upload on files only folders | Thomas Müller | 2013-07-05 | 1 | -5/+7 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-05 | 1 | -35/+98 |
| | | | |||||
* | | | move to non-static OC_Defaults | Björn Schießle | 2013-07-04 | 3 | -9/+9 |
| | | | | | | | | | | | | | | | | | | Conflicts: lib/mail.php | ||||
* | | | Add init funtion to OC_Defaults to be able to wrap translatable strings | Björn Schießle | 2013-07-04 | 3 | -0/+9 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-04 | 2 | -1/+3 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-03 | 1 | -0/+1 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-02 | 8 | -3/+16 |
| | | |||||
* | | add logo claim to defaults.php | Björn Schießle | 2013-07-01 | 2 | -6/+2 |
| | | |||||
* | | construct the foother in defaults.php so that we use always the same footer | Björn Schießle | 2013-07-01 | 1 | -5/+2 |
| | | | | | | | | | | | | Conflicts: settings/templates/admin.php | ||||
* | | Merge pull request #3223 from owncloud/fix-2820 | Morris Jobke | 2013-07-01 | 1 | -2/+2 |
|\ \ | | | | | | | if rename of file fails, the rename is undone in the view - fix 2820 | ||||
| * | | if rename of file fails, the rename is undone in the view - #fix 2820 | Morris Jobke | 2013-06-15 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Changes: * OC.dialog -> OC.Notification * Added test * Fixed OC.Notification.show() issue for queued items * Highlight failed item and show notification | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-01 | 2 | -11/+13 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-30 | 1 | -0/+2 |
| | | | |||||
* | | | Escape dropdown | Lukas Reschke | 2013-06-29 | 1 | -2/+2 |
| | | | | | | | | | Fixes #3241 | ||||
* | | | Merge pull request #2914 from Kondou-ger/label_overlapping_value | Bart Visscher | 2013-06-29 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix textfield label overlapping value. | ||||
| * | | | Fix textfield label overlapping value. | kondou | 2013-04-13 | 1 | -1/+1 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-29 | 2 | -5/+11 |
| | | | | |||||
* | | | | Merge pull request #3838 from rgeber/master | Jörn Friedrich Dreyer | 2013-06-28 | 1 | -1/+42 |
|\ \ \ \ | | | | | | | | | | | Public Upload Feature | ||||
| * | | | | Public upload feature | Roman Geber | 2013-06-25 | 1 | -1/+42 |
| | | | | | |||||
* | | | | | Merge pull request #3576 from owncloud/jquery.multiselect-1.13 | Thomas Tanghus | 2013-06-27 | 2 | -54/+101 |
|\ \ \ \ \ | | | | | | | | | | | | | Update to jquery.multiselect 1.13 | ||||
| * | | | | | Forgot the css. | Thomas Tanghus | 2013-06-04 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Update to jquery.multiselect 1.13 | Thomas Tanghus | 2013-06-02 | 1 | -53/+100 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-27 | 2 | -27/+33 |
| | | | | | | |||||
* | | | | | | move javascript variables 'oc_current_user' and 'oc_requesttoken' to js.js - ↵ | Thomas Mueller | 2013-06-26 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | fixes #3853 | ||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-26 | 3 | -31/+40 |
| |/ / / / |/| | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-25 | 3 | -1/+21 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-23 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-21 | 9 | -0/+23 |
| | | | | |