Commit graph

381 commits

Author SHA1 Message Date
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
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
Jana Deutschländer
2b36826a4e Merge branch 'pagetoolShims' into 'master'
Pagetool shims

See merge request !26
2017-04-10 13:27:41 +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
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
Silke Pisulla
edb0f7a63f SPR-908: QS - margin, padding, font-size 2017-03-30 10:40:01 +02:00
Silke Pisulla
660d7a5b7d SPR-908: QS - margin 2017-03-30 10:39:46 +02:00
Silke Pisulla
eeaa70e6b8 SPR-908: QS - margin, padding, font-size 2017-03-30 10:39:12 +02:00
Jana Deutschländer
6f017a0f1c Merge branch 'showStructInlineEditors' into 'master'
Raise struct inline editors above content

See merge request !22
2017-03-30 05:41:33 +02:00
Jana Deutschländer
76c0f22393 Merge branch 'magicmatcherIssueList' into 'master'
Add Magicmatcher issue list

See merge request !20
2017-03-30 05:40:17 +02:00
Jana Deutschländer
1e29e67dc3 Merge branch 'tplincsupport' into 'master'
support the tplinc plugin

See merge request !23
2017-03-30 05:39:15 +02:00
Andreas Gohr
cad2e67442 support the tplinc plugin
This is a first commit to generally support the plugin and make the page
footer use it. More includes should be added at other places.
2017-03-28 16:55:26 +02:00
Silke Pisulla
0b0e8b37a7 SPR-742: Konfigurierbarkeit links + svgs 2017-03-28 15:55:37 +02:00
Silke Pisulla
0c9df3be9e SPR-742: Konfigurierbarkeit wording 2017-03-28 15:31:24 +02:00
Silke Pisulla
105d1d41aa SPR-908: QS - aside jiralist 2017-03-28 15:11:10 +02:00
Silke Pisulla
2d623f4b2e SPR-742: Konfigurierbarkeit check, neuzuordnung 2017-03-28 15:10:27 +02:00
Silke Pisulla
2c5103748c SPR-742: Konfigurierbarkeit wording german prepared 2017-03-23 15:39:16 +01:00
Silke Pisulla
efa1155dc8 SPR-910: var rename - background (site, page, header, footer) button (bg, color), link (existing) + box-shadow as fix var 2017-03-23 15:38:57 +01:00
Silke Pisulla
202ac8de1e SPR-910: var rename - background (site, page, header, footer) button (bg, color), link (existing) + box-shadow as fix var 2017-03-23 15:38:44 +01:00
Silke Pisulla
2d690fd891 SPR-910: var rename - link existing 2017-03-23 15:31:17 +01:00
Silke Pisulla
107364bfb0 SPR-742: Konfigurierbarkeit border 2017-03-23 15:04:43 +01:00
Silke Pisulla
eeddad9d3c SPR-908: QS - codeverteilung aside 2017-03-23 15:04:00 +01:00
Silke Pisulla
95ad7c26cc SPR-742: Konfigurierbarkeit check vars 2017-03-23 13:02:45 +01:00
Silke Pisulla
be2c0e9552 SPR-908: QS - color "num" 2017-03-23 13:01:01 +01:00
Silke Pisulla
4536a4f38c SPR-742: Konfigurierbarkeit content-width 2017-03-23 13:00:02 +01:00