summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | Merge branch 'master' into oc_previewGeorg Ehrke2013-08-2380-286/+132
|\| | | | |
| * | | | | [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
* | | | | | outsource sharing and deleted files previews to appsGeorg Ehrke2013-08-193-133/+0
* | | | | | style fixes for preview libGeorg Ehrke2013-08-191-4/+5
* | | | | | Merge master into oc_previewGeorg Ehrke2013-08-19105-516/+556
|\| | | | |
| * | | | | 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
| * | | | | | Merge pull request #4475 from owncloud/brighter-font-colorMorris Jobke2013-08-172-5/+31
| |\ \ \ \ \ \
| | * | | | | | fixes for IE8Morris Jobke2013-08-171-3/+3
| | * | | | | | change font on login/install page from black to whiteMorris Jobke2013-08-172-5/+31
| | |/ / / / /
| * | | | | | Merge pull request #4471 from owncloud/password-iconThomas Müller2013-08-174-4/+7
| |\ \ \ \ \ \
| | * | | | | | use proper password icon, three dots are 'more'Jan-Christoph Borchardt2013-08-164-4/+7
| | |/ / / / /
| * | | | | | Merge pull request #4476 from owncloud/doc-on-masterThomas Müller2013-08-172-0/+0
| |\ \ \ \ \ \
| | * | | | | | fix difference between packaged version and masterMorris Jobke2013-08-172-0/+0
| | |/ / / / /
| * / / / / / remove ru_RU - fixes #3135Thomas Müller2013-08-171-9/+0
| |/ / / / /
| * | | | | Merge pull request #4314 from owncloud/css-fixesJan-Christoph Borchardt2013-08-163-27/+14
| |\ \ \ \ \
| | * | | | | tixing width and position of wider error messagesThomas Müller2013-08-162-1/+6
| | * | | | | merge master into css-fixesJan-Christoph Borchardt2013-08-1688-534/+970
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | wrap code output in error messages, fix #4231Jan-Christoph Borchardt2013-07-311-0/+4
| | * | | | | remove unused and never to be used paginationJan-Christoph Borchardt2013-07-311-22/+0
| | * | | | | remove ugly inset shadow from headerJan-Christoph Borchardt2013-07-301-1/+4
| | * | | | | reduce z-index of settings popup, fix #4212Jan-Christoph Borchardt2013-07-301-1/+1
| * | | | | | Merge pull request #4032 from owncloud/more-whitespaceMorris Jobke2013-08-161-47/+82
| |\ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-26 16:30:26 +0000