summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3920 from owncloud/Fixing_search_ie8Jörn Friedrich Dreyer2013-07-091-2/+6
|\ | | | | [ie8] Fix lazy CSS loading and missing borders in search dropdown
| * Fix lazy styles loading in IE8Victor Dubiniuk2013-07-021-2/+6
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-091-0/+1
| |
* | Merge pull request #3963 from owncloud/update-logic-spliticewind19912013-07-081-107/+28
|\ \ | | | | | | Move the upgrade logic to \OC\Updater
| * | split upgrade logic from ajax fileRobin Appelman2013-07-061-107/+28
| | |
* | | Merge pull request #3757 from owncloud/icon-cleanupJan-Christoph Borchardt2013-07-0816-25/+23
|\ \ \ | | | | | | | | Icon cleanup
| * | | change delete from entry forbidden sign to proper iconJan-Christoph Borchardt2013-07-052-3/+10
| | | |
| * | | Optimize pictures with optipng and scourkondou2013-06-215-217/+9
| | | |
| * | | standardize on 32px loading spinner, decrease size in CSS where neededJan-Christoph Borchardt2013-06-173-0/+7
| | | |
| * | | use proper style for add iconJan-Christoph Borchardt2013-06-172-8/+60
| | | |
| * | | remove unused loading spinners, just have oneJan-Christoph Borchardt2013-06-172-0/+0
| | | |
| * | | remove unused big imagesJan-Christoph Borchardt2013-06-172-0/+0
| | | |
| * | | use mail icon consistent with Mail app iconJan-Christoph Borchardt2013-06-172-6/+94
| | | |
| * | | transparent background for lock iconJan-Christoph Borchardt2013-06-171-0/+0
| | | |
| * | | use consistent icon for 'restore'/versions/history, also SVGJan-Christoph Borchardt2013-06-171-0/+0
| | | |
| * | | differentiate delete from close iconJan-Christoph Borchardt2013-06-175-11/+63
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-073-0/+12
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-0662-63/+8
| | |
* | | fixing === and identThomas Müller2013-07-051-6/+6
| | |
* | | Merge branch 'master' into fixing-3934-masterThomas Müller2013-07-053-13/+13
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: core/js/share.js
| * | | no anonymous upload on read-only foldersThomas Müller2013-07-051-9/+11
| | | |
| * | | Merge https://github.com/owncloud/core/pull/3900Björn Schießle2013-07-052-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 foldersThomas Müller2013-07-051-5/+7
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-051-35/+98
| | |
* | | move to non-static OC_DefaultsBjörn Schießle2013-07-043-9/+9
| | | | | | | | | | | | | | | | | | Conflicts: lib/mail.php
* | | Add init funtion to OC_Defaults to be able to wrap translatable stringsBjörn Schießle2013-07-043-0/+9
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-042-1/+3
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-031-0/+1
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-028-3/+16
| |
* | add logo claim to defaults.phpBjörn Schießle2013-07-012-6/+2
| |
* | construct the foother in defaults.php so that we use always the same footerBjörn Schießle2013-07-011-5/+2
| | | | | | | | | | | | Conflicts: settings/templates/admin.php
* | Merge pull request #3223 from owncloud/fix-2820Morris Jobke2013-07-011-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 2820Morris Jobke2013-06-151-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 transifexJenkins for ownCloud2013-07-012-11/+13
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-301-0/+2
| | |
* | | Escape dropdownLukas Reschke2013-06-291-2/+2
| | | | | | | | | Fixes #3241
* | | Merge pull request #2914 from Kondou-ger/label_overlapping_valueBart Visscher2013-06-291-1/+1
|\ \ \ | | | | | | | | Fix textfield label overlapping value.
| * | | Fix textfield label overlapping value.kondou2013-04-131-1/+1
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-292-5/+11
| | | |
* | | | Merge pull request #3838 from rgeber/masterJörn Friedrich Dreyer2013-06-281-1/+42
|\ \ \ \ | | | | | | | | | | Public Upload Feature
| * | | | Public upload featureRoman Geber2013-06-251-1/+42
| | | | |
* | | | | Merge pull request #3576 from owncloud/jquery.multiselect-1.13Thomas Tanghus2013-06-272-54/+101
|\ \ \ \ \ | | | | | | | | | | | | Update to jquery.multiselect 1.13
| * | | | | Forgot the css.Thomas Tanghus2013-06-041-1/+1
| | | | | |
| * | | | | Update to jquery.multiselect 1.13Thomas Tanghus2013-06-021-53/+100
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-272-27/+33
| | | | | |
* | | | | | move javascript variables 'oc_current_user' and 'oc_requesttoken' to js.js - ↵Thomas Mueller2013-06-262-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | fixes #3853
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-263-31/+40
| |/ / / / |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-253-1/+21
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-231-0/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-219-0/+23
| | | | |