Michael Große
1c24bf1989
Merge branch 'master' into toggleConf
2017-04-18 13:10:14 +02:00
Jana Deutschländer
c838ed49ec
Merge branch 'live' into 'master'
...
Remerge Relase-Branch into Master
See merge request !32
2017-04-18 13:06:57 +02:00
Jana Deutschländer
189e2e091e
Merge branch 'reorderPagetools' into 'master'
...
Move 'Back to top' pagetool to the bottom of the pagetools
See merge request !34
2017-04-18 12:58:30 +02:00
Jana Deutschländer
f428fce4af
Merge branch 'moveSidebarHeader' into 'master'
...
Move file sidebar-header include below search
See merge request !33
2017-04-18 12:51:36 +02:00
Michael Große
d012fad75b
Move 'Back to top' pagetool to the end
...
SPR-906
2017-04-13 15:11:45 +02:00
Michael Große
dc4330a7e7
Move file sidebar-header include below search
...
As discussed in today's meeting, there should be no sidebar-content
above the search.
SPR-921
2017-04-13 14:00:57 +02:00
Jana Deutschländer
6ed99691f5
Merge branch 'spis-master' into 'master'
...
spis-master
See merge request !30
2017-04-13 13:30:39 +02:00
Silke Pisulla
d3979d9e7a
SPR-899: struct inline-editor styling
2017-04-13 13:03:59 +02:00
Silke Pisulla
4887064b86
SPR-908: QS - variablennutzung
2017-04-13 13:03:29 +02:00
Michael Große
7d88935b5f
Merge branch 'release/2017-04-13' into live
2017-04-13 10:00:21 +02:00
Michael Große
c5f0df8e6f
Version upped
2017-04-13 09:59:21 +02:00
Michael Große
2bd7f884e5
Remember sidebar section state when browsing the wiki
...
So we do not have to open the same section of the sidebar every time, we click
a link to a new page.
It forgets the toggle-state if the content is manually or automatically
widened, for example by clicking on an edit-button.
SPR-883
2017-04-12 17:20:36 +02:00
Silke Pisulla
2e7555ebeb
Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master
2017-04-12 15:43:51 +02:00
Jana Deutschländer
98321b7ca7
Merge branch 'tplincSidebar' into 'master'
...
Add tplinc locations above and below the sidebar
See merge request !28
2017-04-12 14:54:18 +02:00
Michael Große
cb7cc643bf
Make sidebar toggle elements configurable
...
Current options are h1, h1 and h2, h1-h5, top-level list items
SPR-754
2017-04-12 13:35:33 +02:00
Silke Pisulla
30e688ea48
Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master
2017-04-12 12:04:37 +02:00
Silke Pisulla
1c73fa5363
SPR-908: QS - code
2017-04-12 12:04:15 +02:00
Silke Pisulla
31abc4ae3d
SPR-908: QS - header with magicmatcher
2017-04-12 12:04:06 +02:00
Silke Pisulla
b2e6ef84e9
Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master
2017-04-12 11:55:46 +02:00
Michael Große
485e7ff45a
Add tplinc locations above and below the sidebar
...
SPR-921
2017-04-11 14:43:40 +02:00
Jana Deutschländer
26a5535e70
Merge branch 'fixMissingMobileSidebar' into 'master'
...
fix mobile sidebar not shown if there is no logo
See merge request !27
2017-04-11 09:43:32 +02:00
Michael Große
c0c0fa969b
fix mobile sidebar not shown if there is no logo
...
SPR-918
2017-04-10 16:37:54 +02:00
Silke Pisulla
8aca7d1e5b
SPR-908: QS - ie11
2017-04-10 13:33:51 +02:00
Jana Deutschländer
2b36826a4e
Merge branch 'pagetoolShims' into 'master'
...
Pagetool shims
See merge request !26
2017-04-10 13:27:41 +02:00
Silke Pisulla
3002141dc6
SPR-908: QS - better transition in usertool icons
2017-04-10 13:13:11 +02:00
Silke Pisulla
242e80d535
SPR-908: QS - no break in <code> (except linebreak is needed)
2017-04-10 13:12:45 +02:00
Silke Pisulla
c2ab07c119
SPR-908: QS - comment
2017-04-10 13:11:55 +02:00
Silke Pisulla
068280a221
SPR-908: QS - padding in nav (aside)
2017-04-10 13:11:39 +02:00
Silke Pisulla
5e00b7a4e3
SPR-742: Konfigurierbarkeit history colors
2017-04-10 13:11:17 +02:00
Michael Große
755c6c7959
Add icon for odt-export
...
This icon is somewhat suboptimal and should be replaced when a better
icon is found or created.
SPR-906
2017-04-10 12:28:08 +02:00
Michael Große
4d79698367
fix urls by actually using &
2017-04-10 12:17:46 +02:00
Michael Große
9f631ecba1
Remove misplaced css to fix button background
...
The button should have a transparent background as all the other
buttons.
2017-04-10 11:13:12 +02:00
Michael Große
26c27b0ca0
Merge branch 'master' into pagetoolShims
2017-04-10 11:03:22 +02:00
Silke Pisulla
321533cad2
prepared
2017-04-07 15:23:02 +02:00
Silke Pisulla
7cc53208e5
SPR-908: QS - comments
2017-04-07 15:22:54 +02:00
Silke Pisulla
3554750745
SPR-908: QS - code aufteilung
2017-04-07 15:21:27 +02:00
Silke Pisulla
5c8e72a675
SPR-742: Konfigurierbarkeit - wording
2017-04-07 13:45:40 +02:00
Silke Pisulla
5be78f585a
SPR-908: QS - better hover for svg
2017-04-07 13:45:01 +02:00
Silke Pisulla
602eeed5c0
SPR-908: QS - form in Struct Schema Editor
2017-04-07 13:44:43 +02:00
Silke Pisulla
661ed7e632
SPR-908: QS - table hover
2017-04-07 13:44:04 +02:00
Silke Pisulla
d0de9e1262
SPR-908: QS - better hover without jiggle
2017-04-07 13:43:19 +02:00
Silke Pisulla
de5ca86acf
SPR-908: QS - linkcolor in mesage box
2017-04-07 13:42:28 +02:00
Silke Pisulla
8644ba9a98
SPR-908: QS - config manager
2017-04-07 13:42:00 +02:00
Silke Pisulla
ea893cdcc5
SPR-908: QS - tab plugin
2017-04-07 13:41:28 +02:00
Silke Pisulla
41aeb6900c
SPR-908: QS - file-input
2017-04-07 13:40:49 +02:00
Silke Pisulla
32f9e6bba2
SPR-742: editmode contentblock
2017-04-03 13:42:41 +02:00
Silke Pisulla
0ff585ef5e
SPR-742: wording in configuration view
2017-04-03 13:33:10 +02:00
Silke Pisulla
14705c4ea4
SPR-908: rgb code qs
2017-04-03 13:32:35 +02:00
Silke Pisulla
575c6e7eaa
SPR-742: help toggle in content
2017-04-03 13:32:21 +02:00
Silke Pisulla
89a4c45d5c
SPR-742: edit buttons
2017-04-03 13:31:35 +02:00