Jacques Distler
2ab51ba512
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-24 12:28:23 -06:00
Jacques Distler
3ab7327cea
Whoops! Also Update Maruku
...
Support syntax-colouring for
lang=css
2009-12-24 12:25:44 -06:00
Jacques Distler
e6673c4cee
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-24 00:52:39 -06:00
Jacques Distler
af0f607e75
Syntax Colouring
...
New syntax colouring modes.
In addition to the existing
html, xml, ruby
we now support
yaml, ansic, javascript, sqlite, css
2009-12-24 00:45:45 -06:00
Jacques Distler
22b00d76f1
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-23 02:21:24 -06:00
Jacques Distler
1d32d45944
Upgrade Vendored rubyzip to Version 0.9.3
2009-12-23 02:19:16 -06:00
Jacques Distler
d6b729b5b3
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-22 21:02:34 -06:00
Jacques Distler
7c51accaab
Update Windows sqlite3.dll
...
For whatever the heck it's worth...
2009-12-22 21:00:23 -06:00
Jacques Distler
b4758d9bfa
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-22 20:50:39 -06:00
Jacques Distler
a71e64a172
Update Vendored sqlite3-ruby
2009-12-22 20:48:32 -06:00
Jacques Distler
67b27da5c9
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-18 23:57:05 -06:00
Jacques Distler
9874650e4b
Silence Some Stupid Warnings in Ruby 1.9
2009-12-18 23:53:43 -06:00
Jacques Distler
f50d7189f7
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-18 20:20:17 -06:00
Jacques Distler
76f388f3e2
Vendor Rack 1.0.1
...
Incorporate patch from Revision 496.
2009-12-18 20:16:58 -06:00
Jacques Distler
f8c6c4410e
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-18 11:50:56 -06:00
Jacques Distler
a7202d54cd
Workaround Ruby 1.9.1 tempfile Bug
...
Add a patch (from Passenger 2.2.8) to
vendored Rack, which works around a bug
in Ruby 1.9.1. This patch to Rack has been
floating around the intertubes for a while.
2009-12-18 11:45:26 -06:00
Jacques Distler
8017ce5279
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-17 22:51:59 -06:00
Jacques Distler
a166fb9608
Add Link to BlahTeX Manual
2009-12-17 22:50:10 -06:00
Jacques Distler
cc8aa4b3e0
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-17 10:37:34 -06:00
Jacques Distler
a1420aa5c7
Revamp Markup Cheat Sheets
...
They still suck, but less-so.
2009-12-17 10:29:51 -06:00
Jacques Distler
c391c0eeee
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-16 01:04:56 -06:00
Jacques Distler
fe877a10b4
Make html_ext Available as a Helper
...
... and protected.
2009-12-16 00:59:33 -06:00
Jacques Distler
cf37421f4b
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-14 22:37:37 -06:00
Jacques Distler
f3b69bc57b
Make xhtml_enabled? a Protected Method
...
... as it should be. Remarkably, it's
still possible to use it in views, if
you declare it a helper method.
2009-12-14 22:34:31 -06:00
Jacques Distler
47941683ab
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-14 17:43:53 -06:00
Jacques Distler
d3e79ea84a
Make truncate() Unicode-aware
2009-12-14 17:41:28 -06:00
Jacques Distler
085783d308
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-14 02:07:56 -06:00
Jacques Distler
2c5e5a0015
Refactoring
...
Move the truncate() method into ApplicationHelper.
Move another method around, for no particularly
good reason. Controllers really shouldn't have
public methods that don't correspond to actions.
2009-12-14 02:01:50 -06:00
Jacques Distler
5899e19611
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-13 21:16:26 -06:00
Jacques Distler
dc3d202665
Cache Source View
...
Also, fix a cache-sweeping bug reported,
long ago, by Toby Bartels.
2009-12-13 21:09:12 -06:00
Jacques Distler
a02ada047a
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-13 20:02:24 -06:00
Jacques Distler
1613973929
Array#collect is faster than Array#inject
...
Also add some more tests.
2009-12-13 20:00:18 -06:00
Jacques Distler
0b1fccc178
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-13 19:29:02 -06:00
Jacques Distler
282515d907
Source View
...
Add a Source view. [Based on a suggestion by Andrew Stacey]
Fix a well-formedness bug in the list action, due to
boneheaded truncation algorithm. [Reported by Roby Bartels]
2009-12-13 19:25:14 -06:00
Jacques Distler
9d859343f3
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-12 23:10:05 -06:00
Jacques Distler
c88a1d43dc
Another Textarea Resizing Tweak
...
Handle the 'Change page name'
part of the form more intelligently.
2009-12-12 22:37:38 -06:00
Jacques Distler
9ef71a7bce
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-12 15:30:47 -06:00
Jacques Distler
a58bee7437
Another Textarea Tweak and a Ruby 1.9 Fix
2009-12-12 15:28:05 -06:00
Jacques Distler
3890461b16
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-12 01:16:10 -06:00
Jacques Distler
60a233a917
More Robust
...
Browsers have a bewildering array of
default behaviours for <textarea>s.
This will work a little more uniformly
across brosswers.
2009-12-12 01:12:52 -06:00
Jacques Distler
619f2f1793
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-10 16:59:23 -06:00
Jacques Distler
561a007682
Auto-resizing Textarea
...
Resize textarea to fit viewing area.
Also update Prototype to 1.6.1.
2009-12-10 16:57:05 -06:00
Jacques Distler
ffe50318e3
Add a log/ directory to the GIT repository
...
Dunno why the #$%* GIT repository doesn't have one
(the BZR repository does). For good measure, add a
stub log/production.log file, since the absence of
one, apparently causes troubles for some users.
(And anyway, we all know how much GIT *loves* empty
directories.)
2009-12-09 21:35:50 -06:00
Jacques Distler
efd3def461
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-08 11:49:17 -06:00
Jacques Distler
023d84c4a4
Ack! This is better
2009-12-08 09:08:25 -06:00
Jacques Distler
a06d5443e1
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-08 08:52:09 -06:00
Jacques Distler
faac8951a3
More Ruby 1.9 String Encoding Fun
2009-12-08 08:50:01 -06:00
Jacques Distler
5090d1f167
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-07 15:31:28 -06:00
Jacques Distler
2c5c6dc78a
S5 Fix
...
Omit a (seemingly superfluous)
javascript hack which causes
Gecko-based browsers to request
/my_wiki/s5/null
when they load an s5 slideshow.
Also a stylistic cleanup in
the wiki_controller.
2009-12-07 15:27:40 -06:00
Jacques Distler
36bf257d72
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-05 10:53:19 -06:00