Commit graph

303 commits

Author SHA1 Message Date
Jana Deutschländer
9fbd182782 Merge branch 'pageattributes' into 'master'
refactoring der Pageattributes (qc und do)

See merge request !29
2017-04-19 16:16:08 +02:00
Jana Deutschländer
2b368d03e6 SPR-869: headline hierarchies did not match font-sizes 2017-04-19 16:13:20 +02:00
Jana Deutschländer
16a4631324 SPR-814: detail template local merges 2017-04-19 15:51:32 +02:00
Jana Deutschländer
7b09296348 Merge remote-tracking branch 'origin/detailView'
# Conflicts:
#	lang/de/settings.php
#	lang/en/settings.php
2017-04-19 15:44:01 +02:00
Jana Deutschländer
c6f48ce933 SPR-814: remove comment 2017-04-19 15:36:44 +02:00
Jana Deutschländer
76f5706461 SPR-814: detail template bugfix meta data in webkit 2017-04-19 15:24:25 +02:00
Jana Deutschländer
58aee1016a SPR-814: detail template 2017-04-19 15:21:55 +02:00
Silke Pisulla
401950068f SPR-869: QC Plugin output responsive 2017-04-19 13:04:37 +02:00
Silke Pisulla
f078e012ce SPR-869: QC Plugin output responsive 2017-04-19 12:59:06 +02:00
Silke Pisulla
e8d58fb55b SPR-869: QC Plugin output + icon in breadcrumb 2017-04-19 11:52:59 +02:00
Michael Große
1c24bf1989
Merge branch 'master' into toggleConf 2017-04-18 13:10:14 +02:00
Silke Pisulla
b457c328a9 SPR-908: QS - wiki-icons 2017-04-13 15:35:03 +02:00
Silke Pisulla
9161dde646 SPR-869: QC Plugin icon qs 2017-04-13 15:29:36 +02:00
Silke Pisulla
d160b7e7bb Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into pageattributes 2017-04-13 13:37:09 +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
Jana Deutschländer
a21c6f8785 SPR-869: debug for wiki in root 2017-04-13 12:44:53 +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
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
3f9d4d521a
Merge branch 'master' into pageattributes
Adjusted some more files to account for changes in the over 100 commits
in master since the creation of this branch.

SPR-869
2017-04-11 16:13:02 +02:00
Jana Deutschländer
2ac13e1431 SPR-814: style linked image 2017-04-11 12:53:03 +02:00
Silke Pisulla
8aca7d1e5b SPR-908: QS - ie11 2017-04-10 13:33:51 +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
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
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
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
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
Silke Pisulla
146c8265e6 SPR-742: wiki icons, table in content, edit button, tabinclude 2017-04-03 13:30:34 +02:00
Silke Pisulla
e0f14d54bb SPR-908: struct code qs 2017-04-03 13:28:00 +02:00
Silke Pisulla
93c8a202bd Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master 2017-03-30 10:41:53 +02:00
Silke Pisulla
fd790e2d93 SPR-742: quicksearch suggestionlist 2017-03-30 10:40:58 +02:00
Silke Pisulla
9622faa439 SPR-742: Konfigurierbarkeit zuordnung 2017-03-30 10:40:31 +02:00