Commits

Breadcrumbs

History for

on3waymerge

User selector

All users

All time

Commit history

Commits on Apr 30, 2011

• Scroll to and select first merge conflict in editor

  Show description for 9ae98fa
  splitbrain

  committed
  9ae98faView commit details

  Copy full SHA for 9ae98fa

  View code at this pointBrowse repository at this point

Commits on Apr 21, 2011

• Make locktimer more robust

  Show description for 4b1755b
  adrianheine

  committed
  4b1755bView commit details

  Copy full SHA for 4b1755b

  View code at this pointBrowse repository at this point

Commits on Mar 9, 2011

• Make interwiki links match with every other icon-link: need 1px top and bottom padding or else the icons' top and bottom pixel rows get cut off.

  marklundeberg

  committed
  7b4ea08View commit details

  Copy full SHA for 7b4ea08

  View code at this pointBrowse repository at this point

Commits on Mar 7, 2011

• Merge branch 'indexer_rewrite'

  michitux

  committed
  d8e733eView commit details

  Copy full SHA for d8e733e

  View code at this pointBrowse repository at this point

Commits on Mar 6, 2011

• Pass edid to the mediamanager

  adrianheine

  committed
  dea1115View commit details

  Copy full SHA for dea1115

  View code at this pointBrowse repository at this point

Commits on Feb 26, 2011

• improved css.php and core styles

  Show description for 318cd03
  selfthinker

  committed
  318cd03View commit details

  Copy full SHA for 318cd03

  View code at this pointBrowse repository at this point

Commits on Feb 24, 2011

• Merge branch 'master' into indexer_rewrite

  Show description for f77fc90
  michitux

  committed
  f77fc90View commit details

  Copy full SHA for f77fc90

  View code at this pointBrowse repository at this point

Commits on Feb 11, 2011

• avoid warning in linkwizard when a space is entered as query

  splitbrain

  committed
  c6497d3View commit details

  Copy full SHA for c6497d3

  View code at this pointBrowse repository at this point

Commits on Feb 6, 2011

• Only remove the indexer lock when there is really a stale lock

  Show description for 9f881d0
  michitux

  committed
  9f881d0View commit details

  Copy full SHA for 9f881d0

  View code at this pointBrowse repository at this point

• correctly wait for a lock in indexer (related to FS#2112)

  splitbrain

  committed
  2649727View commit details

  Copy full SHA for 2649727

  View code at this pointBrowse repository at this point

• Use common media_save in media_upload and putAttachment

  Show description for ffb291f
  adrianheine

  committed
  ffb291fView commit details

  Copy full SHA for ffb291f

  View code at this pointBrowse repository at this point

• XML-RPC deleteAttachment now uses media_delete

  Show description for 87229c8
  adrianheine

  committed
  87229c8View commit details

  Copy full SHA for 87229c8

  View code at this pointBrowse repository at this point

• moved locktimer class to its own file

  Show description for 55f92d7
  splitbrain

  committed
  55f92d7View commit details

  Copy full SHA for 55f92d7

  View code at this pointBrowse repository at this point

Commits on Jan 23, 2011

• Merge branch 'master' into indexer_improvements

  Show description for fc756e0
  michitux

  committed
  fc756e0View commit details

  Copy full SHA for fc756e0

  View code at this pointBrowse repository at this point

Commits on Jan 16, 2011

• increase indexer version to reforce rebuild for the new title index

  splitbrain

  committed
  1b052f5View commit details

  Copy full SHA for 1b052f5

  View code at this pointBrowse repository at this point

• Fix several security issues in the XML-RPC interface

  Show description for eff795a
  michitux

  committed
  eff795aView commit details

  Copy full SHA for eff795a

  View code at this pointBrowse repository at this point

Commits on Jan 15, 2011

• added missing change for path length shortener in ajax backend

  splitbrain

  committed
  d83e78eView commit details

  Copy full SHA for d83e78e

  View code at this pointBrowse repository at this point

Commits on Jan 14, 2011

• coding style fix

  splitbrain

  committed
  d0b9caeView commit details

  Copy full SHA for d0b9cae

  View code at this pointBrowse repository at this point

Commits on Jan 9, 2011

• Fixed css_loadfile and removed unneeded complexity, added testcases

  michitux

  committed
  6e0b4b6View commit details

  Copy full SHA for 6e0b4b6

  View code at this pointBrowse repository at this point

• Preserve @import statements in CSS

  

  gbirke

  authored and

  michitux

  committed
  f7d780bView commit details

  Copy full SHA for f7d780b

  View code at this pointBrowse repository at this point

Commits on Dec 29, 2010

• Indexer v3 Rewrite part two, update uses of indexer

  whoopdedo

  committed
  9b41be2View commit details

  Copy full SHA for 9b41be2

  View code at this pointBrowse repository at this point

Commits on Nov 29, 2010

• Remove enc=utf-8 in VIM modeline as it is not allowed in VIM 7.3

  Show description for e3776c0
  michitux

  committed
  e3776c0View commit details

  Copy full SHA for e3776c0

  View code at this pointBrowse repository at this point

Commits on Nov 22, 2010

• Render metadata when needed

  Show description for 9821486
  michitux

  committed
  9821486View commit details

  Copy full SHA for 9821486

  View code at this pointBrowse repository at this point

Commits on Nov 20, 2010

• Merge branch 'master' of git://github.com/splitbrain/dokuwiki

  HakanS

  committed
  8f0a521View commit details

  Copy full SHA for 8f0a521

  View code at this pointBrowse repository at this point

Commits on Nov 17, 2010

• Use a different indexer version when external tokenizer is enabled

  whoopdedo

  committed
  7c2ef4eView commit details

  Copy full SHA for 7c2ef4e

  View code at this pointBrowse repository at this point

Commits on Nov 14, 2010

• Do not assume that index files will be backward compatible

  whoopdedo

  committed
  ee0891dView commit details

  Copy full SHA for ee0891d

  View code at this pointBrowse repository at this point

Commits on Nov 13, 2010

• Introduce metadata write wrapper p_save_metadata

  Show description for 1172f8d
  adrianheine

  committed
  1172f8dView commit details

  Copy full SHA for 1172f8d

  View code at this pointBrowse repository at this point

• Added XMLRPC dokuwiki:appendPage

  HakanS

  committed
  ba9418bView commit details

  Copy full SHA for ba9418b

  View code at this pointBrowse repository at this point

Commits on Nov 2, 2010

• Merge branch 'master', remote branch 'sitemap/master'

  michitux

  committed
  37ba24eView commit details

  Copy full SHA for 37ba24e

  View code at this pointBrowse repository at this point

Commits on Oct 26, 2010

• Fix JS error due to disabled JS based hotkeys because of FS#1958

  michitux

  committed
  de32b03View commit details

  Copy full SHA for de32b03

  View code at this pointBrowse repository at this point

Commits on Oct 25, 2010

• Honor allowdebug setting in lib/exe/indexer

  adrianheine

  committed
  88c5feeView commit details

  Copy full SHA for 88c5fee

  View code at this pointBrowse repository at this point

Commits on Oct 22, 2010

• disabled JS based hotkeys for next stable release FS#1958

  splitbrain

  committed
  87e7175View commit details

  Copy full SHA for 87e7175

  View code at this pointBrowse repository at this point

Commits on Oct 18, 2010

• removed deprecated index update function

  splitbrain

  committed
  74afac0View commit details

  Copy full SHA for 74afac0

  View code at this pointBrowse repository at this point

Commits on Oct 10, 2010

• Merge remote branch 'origin/master' into sitemap

  michitux

  committed
  762b4c4View commit details

  Copy full SHA for 762b4c4

  View code at this pointBrowse repository at this point

Commits on Oct 2, 2010

• Added some 404 handling to lib/exe/detail.php

  splitbrain

  committed
  0b83621View commit details

  Copy full SHA for 0b83621

  View code at this pointBrowse repository at this point