Commit Graph

  • 47e76794cd Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki master Jacques Distler 2011-12-03 17:34:58 -0600
  • 40fd643680 Update Maruku Jacques Distler 2011-12-03 17:31:53 -0600
  • def8e9ae0f Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-11-10 16:07:27 -0600
  • b52a66c207 Don't escape style_additions Jacques Distler 2011-11-10 16:03:54 -0600
  • 4a3d7e0b78 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-10-26 14:23:21 -0500
  • 57d52b0d15 I am a doofus Jacques Distler 2011-10-26 14:21:01 -0500
  • 1ce128348c Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-10-14 10:39:14 -0500
  • 987140ed83 Fix SVG-Edit bug Jacques Distler 2011-10-14 10:35:56 -0500
  • 072e2e1e92 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-10-09 11:50:18 -0500
  • b48a56028a Avoid invalid WikiFile links Jacques Distler 2011-10-09 11:47:04 -0500
  • 8cf98a4711 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-09-30 23:54:06 -0500
  • 66b8f3454d Update SVG-Edit (zoomed-path editing bug) Jacques Distler 2011-09-30 23:52:09 -0500
  • f331becb64 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-09-30 00:11:42 -0500
  • 2d9cc8bf4d Fix tombstone bug and an SVG-Edit regression Jacques Distler 2011-09-30 00:07:53 -0500
  • f1e47a7ec5 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-09-24 00:04:37 -0500
  • e749ee1e4b Update SVG-Edit Jacques Distler 2011-09-24 00:01:43 -0500
  • c102e10315 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-09-23 15:21:21 -0500
  • 22a27c8391 Fix Theorem Environment Jacques Distler 2011-09-23 15:18:08 -0500
  • 7e4c7c447e Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-09-23 02:46:31 -0500
  • f6d350302c Another one... Jacques Distler 2011-09-23 01:25:52 -0500
  • 88dd41e75f Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-09-22 07:55:59 -0500
  • e4b00f0bff Fix bug in Maruku to_html_document_tree Jacques Distler 2011-09-22 07:52:40 -0500
  • 0f4a76d895 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-09-21 13:39:21 -0500
  • 4b09e0322f Another Cache-Sweeping efficiency Jacques Distler 2011-09-21 13:37:33 -0500
  • 07aca55e6e Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-09-21 08:07:47 -0500
  • b6c0ffa0d5 A slight improvement in the efficiency of the Cache Sweeper Jacques Distler 2011-09-20 23:46:36 -0500
  • ddcf022264 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-09-10 23:21:54 -0500
  • d30bd11ff7 Also update SVG-Edit for itex2MML 1.4.7 Jacques Distler 2011-09-10 23:19:26 -0500
  • 1f8a4fe282 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-09-09 11:35:26 -0500
  • eff8c87d39 Better Jacques Distler 2011-09-09 11:33:41 -0500
  • 60a595de17 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-09-09 00:11:44 -0500
  • c603aca852 Expire pages that want file, when file is successfully uploaded Reported by Andrew Stacey Jacques Distler 2011-09-09 00:05:54 -0500
  • 8c74de6670 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-09-07 15:41:53 -0500
  • ee05118e8f Update for itextomml 1.4.7 Jacques Distler 2011-09-07 15:39:41 -0500
  • c7b46cbde3 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-09-05 02:53:39 -0500
  • 7bf832e8c7 Add voffset as an allowed MathML attribute Jacques Distler 2011-09-05 02:50:15 -0500
  • f5c892c717 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-09-03 11:35:37 -0500
  • 364de9dbab Better Jacques Distler 2011-09-03 11:33:51 -0500
  • 1efa08dcc7 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-09-03 11:14:59 -0500
  • ddf1846fe1 Fix double-escaping of flash messages (for real, this time) Jacques Distler 2011-09-03 11:12:49 -0500
  • 04ca7e8a38 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-31 11:59:26 -0500
  • f9e60828c7 Instiki 0.19.3 0.19.3 Jacques Distler 2011-08-31 11:57:20 -0500
  • 9e25ada5c8 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-27 22:01:07 -0500
  • 66f62bac1f Source view for Revisions Jacques Distler 2011-08-27 21:58:14 -0500
  • e00b2a0ac0 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-27 19:33:54 -0500
  • 2801421969 Another Maruku bug: bold in italics Jacques Distler 2011-08-27 19:31:02 -0500
  • b1d1f74b7d Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-27 16:34:33 -0500
  • a088201062 Null search Jacques Distler 2011-08-27 16:30:57 -0500
  • c5a2e325c0 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-27 09:45:27 -0500
  • 26ed59485a This bug is fixed. Jacques Distler 2011-08-27 09:42:50 -0500
  • 2d303d54a0 Better text/html serialization Jacques Distler 2011-08-27 02:40:40 -0500
  • 453693a868 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-26 20:56:53 -0500
  • 27ad6ff2a8 Multiple instances of the same abbreviation Jacques Distler 2011-08-26 20:55:04 -0500
  • e26c12229e Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-23 14:39:30 -0500
  • 903c4b6bdd Pre Chunk-Handler gets confused when XML parser converts empty elements to short-tag syntax. Reported by Andrew Stacey. Jacques Distler 2011-08-23 14:35:27 -0500
  • 09b2d24a18 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-22 11:02:44 -0500
  • e387d095ec Fix double-escaping on Search Page Reported by Andrew Stacey Jacques Distler 2011-08-22 11:00:03 -0500
  • 2d21eabee8 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-22 10:26:46 -0500
  • 6f18c90a50 Ack! 2 more Maruku Errors Jacques Distler 2011-08-22 10:20:17 -0500
  • 03fc0324db Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-22 08:21:43 -0500
  • 6b86177620 Whoops! Need to update those. Jacques Distler 2011-08-22 08:19:39 -0500
  • 3a54d7ee72 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-21 14:00:08 -0500
  • 477bd91567 More Maruku #to_markdown fixes. Jacques Distler 2011-08-21 13:41:20 -0500
  • 1df2483663 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-21 02:50:01 -0500
  • f463a3b1c8 Fix Maruku Indented Codeblocks Jacques Distler 2011-08-21 02:43:43 -0500
  • a739a52f54 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-19 19:37:14 -0500
  • 1e352e28a1 Make Sanitizer::safe_xhtml_sanitize use Nokogiri Jacques Distler 2011-08-19 19:32:53 -0500
  • 85cada931d Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-19 01:57:27 -0500
  • 4b2448b09a Security: Update to Rails 2.3.14 Jacques Distler 2011-08-19 01:54:58 -0500
  • c1826775d2 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-15 10:20:14 -0500
  • 3c650f2cf6 StringScanner is not multibyte-safe. Avoid like the plague. Jacques Distler 2011-08-15 10:18:18 -0500
  • ecaf67dca9 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-14 16:58:45 -0500
  • f7bce2c773 Another Maruku link bug Jacques Distler 2011-08-14 16:54:21 -0500
  • 89f6b69245 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-14 02:18:43 -0500
  • 5c51f930b0 Fix another Maruku bbug Jacques Distler 2011-08-14 02:16:15 -0500
  • ce97abe6ac Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-13 04:01:43 -0500
  • 070f689f9c Fixed some Maruku bugs Jacques Distler 2011-08-13 03:59:40 -0500
  • 5fd725e3a8 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-11 20:40:12 -0500
  • 13a522525c REXML is dead. Long live Nokogiri. Jacques Distler 2011-08-11 20:36:44 -0500
  • 6005297cfe Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-08 01:55:44 -0500
  • 46da1f3aaf Tweaks to lib/chunks/engines.rb Jacques Distler 2011-08-08 01:54:06 -0500
  • a72d35bd4e Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-08 01:46:38 -0500
  • 201c25ce83 Small tweaks to Maruku Jacques Distler 2011-08-08 01:44:01 -0500
  • c9312367c9 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-05 09:09:12 -0500
  • 47996ea1d3 Fix tests for above. Jacques Distler 2011-08-05 09:06:44 -0500
  • f23e1487df Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-08-05 02:02:43 -0500
  • 14592f57f9 Some small efficiencies in the Chunk-handler Jacques Distler 2011-08-05 01:59:18 -0500
  • 7d2275d0a1 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-07-28 23:18:14 -0500
  • 52da76ff38 These Flash messages are html_safe Jacques Distler 2011-07-28 23:16:21 -0500
  • 8d7f33f99b Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-07-07 10:32:49 -0500
  • 2967b207b2 Update for itex2MML 1.4.6 Jacques Distler 2011-07-07 10:18:55 -0500
  • dfad5a3a37 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-06-18 15:57:54 -0500
  • 8b008f8418 Fix Maruku Footnote Backlink Jacques Distler 2011-06-18 15:54:32 -0500
  • fc8be60634 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-06-15 00:50:37 -0500
  • 9e909d5be3 Update Rails, rails_xss and Bundler Jacques Distler 2011-06-15 00:43:38 -0500
  • 088b535d52 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-06-12 12:59:12 -0500
  • ec443685a6 MathJax 1.1a final Jacques Distler 2011-06-12 12:57:10 -0500
  • 97148dc205 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 0.19.2 Jacques Distler 2011-06-11 23:42:34 -0500
  • cbf13ad57a Instiki 0.19.2 Jacques Distler 2011-06-11 23:39:42 -0500
  • ec31e46e92 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki Jacques Distler 2011-06-09 08:36:27 -0500