Commit graph

452 commits

Author SHA1 Message Date
Silke Pisulla
ee135d5f6e SPR-814: detail.php "show img " 2017-04-20 11:56:22 +02:00
Jana Deutschländer
6db1065031 SPR-814: bugfix for content toggle / sidebar section toggle in detail template 2017-04-20 11:42:42 +02:00
Silke Pisulla
1741a375bc SPR-908: stop floating after msg-box 2017-04-20 10:49:24 +02:00
Silke Pisulla
41b18cd7b1 Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master 2017-04-20 08:54:57 +02:00
Jana Deutschländer
c22ee858b3 Merge branch 'fixDoDashboardLink' into 'master'
Fix link to do-dashboard per the plugins config

See merge request !36
2017-04-19 17:18:30 +02:00
Michael Große
c75ed2051f
Merge branch 'master' into fixDoDashboardLink 2017-04-19 16:17:32 +02:00
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
8bd1d76c66 Merge branch 'bugfix/wrongLogoOrder' into 'master'
Use favicons for square logos

See merge request !35
2017-04-19 16:04:05 +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
571fa3c684 SPR-814: remove comment 2017-04-19 15:33:47 +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
Michael Große
22dab1a51e
Fix link to do-dashboard per the plugins config
SPR-931
2017-04-19 14:57:28 +02:00
Silke Pisulla
8a35e69462 SPR-908: footer widescreen 2017-04-19 14:24:11 +02:00
Silke Pisulla
c14dbc7492 SPR-882: section edit button improvements 2017-04-19 14:17:13 +02:00
Silke Pisulla
476022bd24 SPR-926: contrast for CODE 2017-04-19 13:42:18 +02:00
Silke Pisulla
8028368430 SPR-926: contrast for CODE 2017-04-19 13:38:01 +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
4134f067df
Use favicons for square logos
Since our current approach is to crop non-square logos, we should try all
square logos first.

Since favicons are usually small, we prefer them for the shortcut icon.
However since wiki:logo-square.png is usually larger, it is more
suitable for downscaling, so it should be preferred over favicons, which
would need to be upscaled.

SPR-928
2017-04-19 11:52:48 +02:00
Jana Deutschländer
58370f0332 Merge branch 'toggleConf' into 'master'
Make toggle elements configurable and remember toggle state

See merge request !31
2017-04-19 10:51:10 +02:00
Michael Große
270380eb00
Remove $showTools, because it is set to true
Since the config-option for hide-tools no longer exists, this variable
has become superflous.
2017-04-18 13:48:52 +02:00
Michael Große
e302d67fb6
Remove references to removed options
In commit cb7cc643bf the other options
were removed, as discussed.

This commit now removes references to these options from the codebase.

SPR-754
2017-04-18 13:24:33 +02:00
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
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
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
Silke Pisulla
d160b7e7bb Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into pageattributes 2017-04-13 13:37:09 +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
Jana Deutschländer
a21c6f8785 SPR-869: debug for wiki in root 2017-04-13 12:44:53 +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
fa31b96cc4 SPR-814: html5 instead of xhtml 2017-04-12 15:14:46 +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