Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pull from origin #2

Closed
wants to merge 527 commits into from
Closed

Pull from origin #2

wants to merge 527 commits into from

Conversation

huksley
Copy link
Owner

@huksley huksley commented Aug 16, 2016

No description provided.

@giterlizzi
Changed textarea "font-family" in edit mode
e675c96
@giterlizzi
Fixed ScrollSpy behavior
cd83fea
@giterlizzi
Merge branch 'hotfix/scrollspy' into develop
db2ce71
@giterlizzi
Fixed TOC behavior with the same #ID in the article and sidebar (than…
09fe388 
…ks to HanFox on #166)
@giterlizzi
Merge branch 'hotfix/toc' into develop
22b9532
@giterlizzi
Merge branch 'hotfix/toc'
070633f
@giterlizzi
Added missing button style in Media Manager (thanks to @nkukard on #168…
b9d7916 
… issue)
@giterlizzi
Merge branch 'hotfix/media'
89677ad
@giterlizzi
Merge branch 'hotfix/media' into develop
a177d4a
@giterlizzi
Updated translation (de) from Transifex
8387f48
@giterlizzi
Merge branch 'feature/lang'
ca0cbee
@giterlizzi
Fixed unhexpected behavior in TOC and SQLite plugin
3d95a6f
@giterlizzi
Merge branch 'hotfix/toc'
318b454
@giterlizzi
Merge branch 'hotfix/toc' into develop
4ea4636
@giterlizzi
Added missing Google Analytics code in detail.php (thanks to @AlekSet …
49533d1 
…on #170 issue)
@giterlizzi
Merge branch 'hotfix/ga-detail'
a97f428
@giterlizzi
Merge branch 'hotfix/ga-detail' into develop
74c0e48
@giterlizzi
Speed improvements in detail.php
d67fade
@giterlizzi
Improvements in detail.php (thanks to @AlekSet for the idea on #171 i…
e17ba24 
…ssue)

  * Moved image info in a modal dialog
  * Added link to original image
  * Now detail.php have the same layout of main.php
@giterlizzi
Using "wl()" function to build the Theme Switcher URL
a81bc58
@giterlizzi
Use the "tpl_basedir()" function instead of deprecated "DOKU_TPL" con…
5e6ebf4 
…stant (thanks to @umbomas on #175 issue)
@giterlizzi
Merge branch 'hotfix/tpl-dir'
6112ed7
@giterlizzi
Merge branch 'hotfix/tpl-dir' into develop
6c99bac
@giterlizzi
Fixed Pagetools are behind the scrollbar on IE11 (thanks to @blacklor…
5e5aa55 
…d049 on #174 issue)
@giterlizzi
Merge branch 'hotfix/ie11-scroll'
73a5587
@giterlizzi
Merge branch 'hotfix/ie11-scroll' into develop
38d7170
@giterlizzi
Changed color of toolbar in Bootswatch Cosmo theme (thanks to @drguildo…
560783b 
… on #172)
@giterlizzi
Merge branch 'hotfix/cosmo-toolbar'
67ac1af
@giterlizzi
Merge branch 'hotfix/cosmo-toolbar' into develop
53e29f9
@giterlizzi
Added new option ("tocAffix": default 1) to disable/enable the affix …
6aef763 
…of TOC
@giterlizzi
Merge branch 'feature/lang' into develop
ede81cf
@giterlizzi
Merge branch 'develop'
745159f
@giterlizzi
Fixed sidebar visibility for "sidebarPosition=right" config (thanks to …
6d59031 
…@AlekSet #232)
@giterlizzi
Merge branch 'hotfix/sidebars'
9718740
@giterlizzi
Updated Korean (ko) translation from Transifex
76bd63a
@giterlizzi
Added Portuguese (Brazil) (pt-br) translation from Transifex
c01d68c
@giterlizzi
Updated Russian (ru) translation from Transifex
d7ad0bb
@giterlizzi
Merge branch 'feature/lang'
72c0a22
@giterlizzi
Fixed Acronyms are printed with braces (thanks to @mihula on #236)
83bb6e9
@giterlizzi
Fixed visibility of Overlay plugin on print
ea988ea
@giterlizzi
Merge branch 'hotfix/acronym-on-print'
0aab4ba
@giterlizzi
Created ISSUE_TEMPLATE.md
8982234
@giterlizzi
Merge branch 'master' of github.com:LotarProject/dokuwiki-template-bo…
057aec9 
…otstrap3
@giterlizzi
Fixed typo for Overlay Plugin (thanks to @ysalmon on #237)
9292fe0
@giterlizzi
Merge branch 'hotfix/overlay-plugin-typo'
3b6563c
@giterlizzi
Updated French (fr) translation from Transifex
afec5ac
@giterlizzi
Updated Korean (ko) translation from Transifex
9ebcbc7
@giterlizzi
Updated Russian (ru) translation from Transifex
7f9deae
@giterlizzi
Updated Chinese (zh) translation from Transifex
8decb8d
@giterlizzi
Merge branch 'feature/lang'
863bc60
@giterlizzi
Fixed inlinetoc plugin visibility (thanks to @baxQ on #115)
d2af927
@giterlizzi
Merge branch 'hotfix/inlinetoc-visibility'
68bd60d
@giterlizzi
Updated ISSUE_TEMPLATE.md
6677dea
@giterlizzi
Fixed incompatibility with Snippets Plugin (thanks to @moz0817, @brad…
d696649 
…szabo and @Lethert on #213)
@giterlizzi
Merge branch 'hotfix/snippets-plugin'
6fc1d7d
@giterlizzi
Added Table Width plugin support (thanks to @Lethert and @lukderp on #…
c5a9631 
…239)
@giterlizzi
Merge branch 'feature/table-width-plugin'
6983e7b
huksley added a commit that referenced this pull request Aug 16, 2016
@huksley
Merge from origin pull #2
4e95c9c
@huksley huksley closed this in 6b49ddf Aug 16, 2016
huksley added a commit that referenced this pull request Aug 16, 2016
@huksley
Merge from origin. Fixes #2
2b979af
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@huksley @issmirnov @Lethert @giterlizzi