summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Use provided mimetype on open. Fix #4696Thomas Tanghus2013-09-021-2/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #4657 from owncloud/files-controls-fixesMorris Jobke2013-09-011-7/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | adjust right padding of controls bar, fix #4650Jan-Christoph Borchardt2013-08-301-2/+2
| * | | | | | | | | | fix coding style for controls barJan-Christoph Borchardt2013-08-301-7/+13
* | | | | | | | | | | Merge pull request #4674 from owncloud/fit-filepicker-new-iconsMorris Jobke2013-09-012-2/+19
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | IE8 fixesMorris Jobke2013-09-021-0/+4
| * | | | | | | | | | Fit filesummary for \OC\Preview's ne mimetype-iconskondou2013-08-311-2/+15
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #4671 from owncloud/emptycontentBernhard Posselt2013-09-011-1/+8
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | rename emptyfolder to emptycontentAlessandro Cosentino2013-08-311-5/+5
| * | | | | | | | | text centered horizontally and vertically in emptycontent divAlessandro Cosentino2013-08-311-1/+8
| |/ / / / / / / /
* / / / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-09-0151-15/+78
|/ / / / / / / /
* | | | | | | | Merge master into oc_previewGeorg Ehrke2013-08-3031-317/+489
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #4661 from owncloud/separate-app-stylesJan-Christoph Borchardt2013-08-303-283/+282
| |\ \ \ \ \ \ \ \
| | * | | | | | | | move CSS for browser-specific fixes out of styles.css into new fixes.cssJan-Christoph Borchardt2013-08-302-44/+46
| | * | | | | | | | move CSS for apps out of styles.css into new apps.cssJan-Christoph Borchardt2013-08-302-239/+236
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-3026-26/+177
| * | | | | | | | | Merge pull request #4660 from owncloud/apps-management-stickyMorris Jobke2013-08-302-2/+25
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Apps management as sticky footer and rename to 'Apps', fix #4622Jan-Christoph Borchardt2013-08-302-2/+25
| | |/ / / / / / / /
| * / / / / / / / / Use Group methods for searching, fixes #4201Arthur Schiwon2013-08-301-6/+5
| |/ / / / / / / /
* | | | | | | | | Merge master into oc_previewGeorg Ehrke2013-08-2919-183/+162
|\| | | | | | | |
| * | | | | | | | Merge pull request #4552 from dampfklon/fix4552Morris Jobke2013-08-281-1/+5
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Make group suffix in share dialog translatabledampfklon2013-08-221-1/+5
| * | | | | | | | Merge pull request #4618 from owncloud/visualize-jsMorris Jobke2013-08-281-0/+65
| |\ \ \ \ \ \ \ \
| | * | | | | | | | fixing typoThomas Müller2013-08-281-1/+1
| | * | | | | | | | calculate fontsize and line-heightMorris Jobke2013-08-281-2/+7
| | * | | | | | | | reviewers commentsMorris Jobke2013-08-281-6/+14
| | * | | | | | | | add visualizeMorris Jobke2013-08-281-0/+52
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge pull request #4627 from owncloud/trashbin-tipsyMorris Jobke2013-08-281-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | change orientation for delete tooltip to left, fix #4589Jan-Christoph Borchardt2013-08-281-0/+1
| | | |/ / / / / | | |/| | | | |
| * | | | | | | fix shadow style of username input boxJan-Christoph Borchardt2013-08-281-3/+3
| * | | | | | | remove show password toggle from log in page, ref #4577 #4580Jan-Christoph Borchardt2013-08-282-4/+1
| |/ / / / / /
| * | | | | | Merge pull request #4434 from owncloud/fix_octemplate_escapingThomas Tanghus2013-08-281-4/+5
| |\ \ \ \ \ \
| | * | | | | | Cache Object.keys(this.vars)Thomas Tanghus2013-08-281-3/+4
| | * | | | | | Fix octemplate string escaping.Thomas Tanghus2013-08-141-4/+4
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-287-4/+47
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-274-15/+22
| * | | | | | | Merge pull request #4586 from owncloud/fixing-3431-masterMorris Jobke2013-08-271-140/+0
| |\ \ \ \ \ \ \
| | * | | | | | | kill zh_CN.GB2312Thomas Müller2013-08-271-140/+0
| * | | | | | | | adding translations to update eventsThomas Müller2013-08-271-12/+13
| |/ / / / / / /
* | | | | | | | Merge master into oc_previewGeorg Ehrke2013-08-265-14/+45
|\| | | | | | |
| * | | | | | | Merge pull request #4281 from owncloud/ie8-multiselectMorris Jobke2013-08-261-0/+7
| |\ \ \ \ \ \ \
| | * | | | | | | Better ie8 multiselectVictor Dubiniuk2013-08-011-0/+7
| * | | | | | | | Merge pull request #4519 from owncloud/style-fixesMorris Jobke2013-08-261-1/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | fix reviewers concernsMorris Jobke2013-08-261-1/+1
| | * | | | | | | | fix minor style issue in the app navigationMorris Jobke2013-08-191-1/+5
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-252-8/+12
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge pull request #4331 from owncloud/improve_app-managementChristopher2013-08-251-1/+11
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into improve_app-managementkondou2013-08-2188-285/+129
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Move .errormsg from settings-css to .warning in core. Reusable!kondou2013-08-181-1/+11
| * | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-231-4/+10
| | |_|_|_|_|/ / / / | |/| | | | | | | |