summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into diff_navigationGerrit Uitslag2014-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. * include upstream change * added dropdowns
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into diff_navigationGerrit Uitslag2014-02-15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into diff_navigationGerrit Uitslag2014-02-15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | retrieve revisions around some given revisionsGerrit Uitslag2013-11-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With unit tests One case is not yet fixed: when rev1 is first rev from changelog, only $max/2 revisions are retrieved, but it should retrieve $max revisions.
| | * | | | | | | | | | | | | | | | read changelog with chunks of chunksize size in getRevisions()Gerrit Uitslag2013-11-27
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | bugfix and reformatting changelog. small chunck unittestsGerrit Uitslag2013-11-22
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Improve changelog reading. Inclusive unittests for chunks smaller than ↵Gerrit Uitslag2013-11-22
| | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changelog lines.
| | * | | | | | | | | | | | | | improve unittests getrelativerevision. Bit code reformatting unit testsGerrit Uitslag2013-11-21
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | fix not updated call, renamingGerrit Uitslag2013-11-21
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | refactor PageRevisionLog into Media- and PageChangelog extending ChangelogGerrit Uitslag2013-11-21
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Improved isCurrentRevision(), tests includedGerrit Uitslag2013-11-21
| | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | isCurrentPage is page dependentGerrit Uitslag2013-11-20
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | update function calls to changelog functionsGerrit Uitslag2013-11-20
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Add unit tests for getRelativerevisionGerrit Uitslag2013-11-20
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Update changelog unit testsGerrit Uitslag2013-11-20
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | page related changelog reading refactored to classGerrit Uitslag2013-11-20
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into diff_navigationGerrit Uitslag2013-11-19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ merge master in branchKlap-in2013-07-14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | some refactoringKlap-in2013-02-04
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Add some breaks to while loops.Klap-in2013-01-28
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Add working EoF and BoF checks when chunck reading.Klap-in2013-01-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also isset on meta-last_change-date entry.
| | * | | | | | | | | | | | | | | Added diff navigationKlap-in2013-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Navigation links to move to previous edit before revision in left column or next/last edit after revision in right column.
| * | | | | | | | | | | | | | | | Merge pull request #617 from Werkov/masterChristopher Smith2014-03-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | Fixed cache dependency for template's style.ini
| | * | | | | | | | | | | | | | | Fixed cache dependency for template's style.iniMichal Koutný2014-03-16
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Web path was used instead of filesystem one.
| * | | | | | | | | | | | | | | Merge pull request #574 from splitbrain/FS#2124deniedtextAndreas Gohr2014-03-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve denied access text FS#2124
| | * | | | | | | | | | | | | | | remove placeholder van denied.txtGerrit Uitslag2014-03-07
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | removed 'not logged in' text, loginform is shown alreadyGerrit Uitslag2014-03-06
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Revert "added stripped bit to language file"Gerrit Uitslag2014-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 524df5769a0b9b7aa35af6500c85528c2b0515fe. Conflicts: inc/lang/bn/lang.php inc/lang/fr/lang.php
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into FS#2124deniedtextGerrit Uitslag2014-03-04
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/lang/bn/lang.php inc/lang/fr/denied.txt
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'FS#2124deniedtext' of github.com:splitbrain/dokuwiki into ↵Gerrit Uitslag2014-03-04
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FS#2124deniedtext
| | | * | | | | | | | | | | | | | | | added stripped bit to language fileAndreas Gohr2014-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this has been done by a script and might not be 100% accurate
| | * | | | | | | | | | | | | | | | | added login form at denied access pageGerrit Uitslag2014-03-04
| | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - restore lang string as well
| | * | | | | | | | | | | | | | | | Update localizationsGerrit Uitslag2014-02-25
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | added new html_denied() method as wellGerrit Uitslag2014-02-25
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Show 'not logged in' only when logged out FS#2124Gerrit Uitslag2014-02-25
| | | |_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'lang_update_119' of ↵Andreas Gohr2014-03-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://github.com/dokuwiki-translate/dokuwiki into pull-request-605 * 'lang_update_119' of git://github.com/dokuwiki-translate/dokuwiki: translation update Conflicts: lib/plugins/acl/lang/et/lang.php
| | * | | | | | | | | | | | | | | | translation updateJanar Leas2014-03-12
| | | |_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge pull request #554 from splitbrain/fileiconsAndreas Gohr2014-03-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switched file icons against generated ones, added 32x32 versions
| | * | | | | | | | | | | | | | | | adjusted the office type color againAndreas Gohr2014-03-07
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | updated file icons once moreAndreas Gohr2014-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adjusted some colors, added a few common extensions for codeblocks
| | * | | | | | | | | | | | | | | | fixed index fileAndreas Gohr2014-03-06
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | moved 16x16 icons to their original locationsAndreas Gohr2014-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for backwards compatibility
| | * | | | | | | | | | | | | | | | removed script, added README insteadAndreas Gohr2014-02-28
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | file icon updatesAndreas Gohr2014-02-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now we no longer limit generation to the extensions in mime types, because file icons are used in downloadable code blocks, too. All icons were regenerated with the latest update of the generator.
| | * | | | | | | | | | | | | | | | Switched file icons against generated ones, added 32x32 versionsAndreas Gohr2014-02-16
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge pull request #615 from splitbrain/event_warningAndreas Gohr2014-03-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Events: Trigger a warning if the default action is not callable
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into event_warningMichael Hamann2014-03-14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Events: Trigger a warning if the default action is not callableMichael Hamann2014-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a warning in the case that the default action is not null but also not callable which can happen when the supplied method is not public.
| * | | | | | | | | | | | | | | | | | | Merge branch 'lang_update_123' of ↵Andreas Gohr2014-03-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://github.com/dokuwiki-translate/dokuwiki into pull-request-611 * 'lang_update_123' of git://github.com/dokuwiki-translate/dokuwiki: translation update Conflicts: lib/plugins/acl/lang/et/lang.php
| | * | | | | | | | | | | | | | | | | | | translation updateJanar Leas2014-03-13
| | | |_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-14 19:32:08 +0000