summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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 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
| |_|_|_|_|/ |/| | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-222-8/+11
| |/ / / / |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-211-4/+6
* | | | | Merge pull request #4262 from owncloud/fix_jslint_kondouChristopher2013-08-209-38/+52
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into fix_jslint_kondoukondou2013-08-18102-617/+1122
| |\ \ \ \ \
| * | | | | | Fix a syntax error & have if-conds in an own linekondou2013-08-011-7/+21
| * | | | | | Fix some JSLint warningskondou2013-07-319-38/+38
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1968-236/+63
| |_|_|/ / / |/| | | | |
* | | | | | adding file templates for ods, odt and odpThomas Müller2013-08-183-0/+0
* | | | | | Merge pull request #4497 from owncloud/newlines_at_eof_kondouKondou2013-08-187-7/+7
|\ \ \ \ \ \
| * | | | | | Add _many_ newlines at the end of fileskondou2013-08-187-7/+7
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4496 from owncloud/fixing-error-page-layout-masterKondou2013-08-181-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | fixing error page layoutThomas Müller2013-08-181-0/+1
| |/ / / /
* | | | | Fixed inconsistent spacing.Owen Winkler2013-08-181-1/+1
* | | | | fixing undefined js errorThomas Müller2013-08-171-1/+1
|/ / / /
* | | | Merge pull request #4339 from owncloud/mimetype-defaultsThomas Müller2013-08-171-0/+9
|\ \ \ \
| * \ \ \ Merge branch 'master' into mimetype-defaultsThomas Müller2013-08-1687-509/+865
| |\ \ \ \
| * | | | | add template for html filesRobin Appelman2013-08-071-0/+9
* | | | | | Merge pull request #4482 from owncloud/remove_cancel_button_filepickerKondou2013-08-171-4/+0
|\ \ \ \ \ \
| * | | | | | Remove cancel button from filepickerkondou2013-08-171-4/+0