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 Feb 6, 2011

• 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 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 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 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 Jun 27, 2010

• use config cascade for userscripts and styles FS#1678

  splitbrain

  committed
  09edb71View commit details

  Copy full SHA for 09edb71

  View code at this pointBrowse repository at this point

Commits on Jun 26, 2010

• Hotkey trigger is now CTRL-ALT FS#1958

  Show description for 7e1f9fd
  splitbrain

  committed
  7e1f9fdView commit details

  Copy full SHA for 7e1f9fd

  View code at this pointBrowse repository at this point

Commits on Jun 22, 2010

• temporary disable hotkey JS for FS#1958

  splitbrain

  committed
  fa61423View commit details

  Copy full SHA for fa61423

  View code at this pointBrowse repository at this point

Commits on May 8, 2010

• Reimplementation of Accesskeys in javascript (FS#1809), toolbar accesskyes fix.

  

  Marek Sacha

  authored and

  splitbrain

  committed
  4062d3dView commit details

  Copy full SHA for 4062d3d

  View code at this pointBrowse repository at this point

• Reimplementation of Accesskeys in JavaScript (FS#1809)

  

  Marek Sacha

  authored and

  splitbrain

  committed
  7ea8e59View commit details

  Copy full SHA for 7ea8e59

  View code at this pointBrowse repository at this point

Commits on Mar 26, 2010

• Rewrite JavaScript change check

  adrianheine

  committed
  26ee1edView commit details

  Copy full SHA for 26ee1ed

  View code at this pointBrowse repository at this point

Commits on Mar 12, 2010

• Merge branch 'requireall'

  Show description for d787949
  splitbrain

  committed
  d787949View commit details

  Copy full SHA for d787949

  View code at this pointBrowse repository at this point

Commits on Feb 15, 2010

• Disable locking when locktime is zero

  

  danxuliu

  authored and

  splitbrain

  committed
  544ed90View commit details

  Copy full SHA for 544ed90

  View code at this pointBrowse repository at this point

Commits on Feb 1, 2010

• removed require's in lib/exe/*

  splitbrain

  committed
  24b3cb1View commit details

  Copy full SHA for 24b3cb1

  View code at this pointBrowse repository at this point

Commits on Jan 20, 2010

• New mail subscription with digest

  adrianheine

  committed
  5b75cd1View commit details

  Copy full SHA for 5b75cd1

  View code at this pointBrowse repository at this point

Commits on Jan 12, 2010

• Factor out timer and delay management

  Show description for 21ed602
  adrianheine

  committed
  21ed602View commit details

  Copy full SHA for 21ed602

  View code at this pointBrowse repository at this point

• Allow hyphens and underscores in javascript include filenames

  Show description for 98dba5a
  adrianheine

  committed
  98dba5aView commit details

  Copy full SHA for 98dba5a

  View code at this pointBrowse repository at this point

Commits on Nov 5, 2009

• Fix js_compress regexp detection

  Show description for ef457c6
  splitbrain

  committed
  ef457c6View commit details

  Copy full SHA for ef457c6

  View code at this pointBrowse repository at this point

Commits on Nov 4, 2009

• Emit less E_NOTICEs and E_STRICTs

  Show description for c66972f
  adrianheine

  committed
  c66972fView commit details

  Copy full SHA for c66972f

  View code at this pointBrowse repository at this point

Commits on Nov 2, 2009

• LinkWizard: don't add a title when useheading is used for content FS#1745

  Show description for d9e6a3c
  splitbrain

  committed
  d9e6a3cView commit details

  Copy full SHA for d9e6a3c

  View code at this pointBrowse repository at this point

Commits on Oct 18, 2009

• save compressed css/js caches with io_saveFile and check for gzip support

  Show description for c831740
  splitbrain

  committed
  c831740View commit details

  Copy full SHA for c831740

  View code at this pointBrowse repository at this point

Commits on Oct 16, 2009

• Whitespace cleanup FS#1709

  Show description for 47583ff
  furun

  committed
  47583ffView commit details

  Copy full SHA for 47583ff

  View code at this pointBrowse repository at this point

Commits on Oct 6, 2009

• do not display full path names in JS comments FS#1770

  Show description for 57d846d
  splitbrain

  committed
  57d846dView commit details

  Copy full SHA for 57d846d

  View code at this pointBrowse repository at this point

Commits on Aug 12, 2009

• simplify JavaScript loading

  Show description for 6392c3b
  splitbrain

  committed
  6392c3bView commit details

  Copy full SHA for 6392c3b

  View code at this pointBrowse repository at this point

• Link Wizard added

  Show description for 56dfcc1
  splitbrain

  committed
  56dfcc1View commit details

  Copy full SHA for 56dfcc1

  View code at this pointBrowse repository at this point

• Script lib for draggable DOM objects

  Show description for 050f4a9
  splitbrain

  committed
  050f4a9View commit details

  Copy full SHA for 050f4a9

  View code at this pointBrowse repository at this point

Commits on May 28, 2009

• more javascript refactoring

  Show description for 6b6da7f
  splitbrain

  committed
  6b6da7fView commit details

  Copy full SHA for 6b6da7f

  View code at this pointBrowse repository at this point

Commits on May 15, 2009

• start of toolbar javascript refactoring

  Show description for bbca79d
  splitbrain

  committed
  bbca79dView commit details

  Copy full SHA for bbca79d

  View code at this pointBrowse repository at this point

Commits on Mar 13, 2009

• Support for multirange requests for media FS#1630

  Show description for 758447c
  splitbrain

  committed
  758447cView commit details

  Copy full SHA for 758447c

  View code at this pointBrowse repository at this point

Commits on Jan 22, 2009

• fixed multiple gzip/sendfile problems in css and js dispatchers FS#1571

  Show description for 98bda4f
  splitbrain

  committed
  98bda4fView commit details

  Copy full SHA for 98bda4f

  View code at this pointBrowse repository at this point

• further updates to config_cascade patch

  Show description for f812158
  

  Chris Smith

  committed
  f812158View commit details

  Copy full SHA for f812158

  View code at this pointBrowse repository at this point

Commits on Jan 18, 2009

• Add capability to send pre-compressed js & css files if the browser can accept them

  Show description for ca2b464
  

  Chris Smith

  committed
  ca2b464View commit details

  Copy full SHA for ca2b464

  View code at this pointBrowse repository at this point

Commits on Oct 19, 2008

• The last "removed ALT+ from recent changes accesskeys" patch by Michael Klier forgot to remove the updateAccessKeyTooltip reference in js.php. If the function deletion was not erroneously deleted b…

  Show description for 5ec8d09
  

  Samuele Tognini

  committed
  5ec8d09View commit details

  Copy full SHA for 5ec8d09

  View code at this pointBrowse repository at this point

Commits on Oct 12, 2008

• Include host in the seed for the JS and the CSS cachenames (FS#1487)

  Show description for e3e6ab3
  foosel

  committed
  e3e6ab3View commit details

  Copy full SHA for e3e6ab3

  View code at this pointBrowse repository at this point