Jacques Distler
61a52a91e1
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-24 12:27:06 -06:00
Jacques Distler
aea2c5099f
More Ruby 1.9 Encoding Fun
...
Under Ruby 1.9, could not delete orphan
pages with utf-8 names. They would be
listed as orphan, but "Delete Orphan Pages"
would silently not delete them.
Fixed.
2010-01-24 12:23:47 -06:00
Jacques Distler
7a12cdb502
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-23 18:33:22 -06:00
Jacques Distler
b9db67073d
Ruby 1.9 fix
...
Make the previous fixes work under Ruby 1.9
as well.
2010-01-23 18:30:17 -06:00
Jacques Distler
a8370d5f45
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-23 18:25:30 -06:00
Jacques Distler
09e885d299
Small Cleanup
...
Small cleanup to the zip export.
2010-01-23 18:24:14 -06:00
Jacques Distler
a7d38ef6a1
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-23 18:12:23 -06:00
Jacques Distler
8ed5a88db0
Fix Zip Export and Print View
...
Fix http://bug.to/issues/show/335
and
http://bug.to/issues/show/334
We now bundle the uploaded files directory
(and the public/ directory for the (X)HTML
export) in the Zipball when exporting a Web.
Also, correct the Print View to produce proper links
uploaded files.
2010-01-23 18:01:02 -06:00
Jacques Distler
c85b50ff66
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-23 09:11:18 -06:00
Jacques Distler
ad2fab42bd
Whoops!
...
Move darken() helper method from
wiki_helper.rb to application_helper.rb.
2010-01-23 09:07:57 -06:00
Jacques Distler
512b8d60b9
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-23 00:24:48 -06:00
Jacques Distler
979ea7eca0
CSS Improvements
...
Fixed a few aesthetic matters.
2010-01-23 00:21:14 -06:00
Jacques Distler
36089f1543
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-07 08:14:28 -06:00
Jacques Distler
d67ce28855
Prevent Renaming to a Null Page Name
...
Fix http://rubyforge.org/tracker/index.php?func=detail&aid=27649&group_id=186&atid=783
2010-01-07 08:12:22 -06:00
Jacques Distler
6a5b0e108a
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-07 00:10:35 -06:00
Jacques Distler
c8ef0a3dd4
Release Instki 0.18.1
...
Seems warranted, in light of the
Ruby 1.9 encoding issues.
2010-01-07 00:07:10 -06:00
Jacques Distler
0c2bc65e7a
All I want for Christmas ...
...
... is to settle these encoding issues
once and for all.
Let's override the accessor methods, which
seems to offer a simpler solution.
Now with tests (for whatever that helps)...
2010-01-06 08:15:34 -06:00
Jacques Distler
036f6335ad
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-05 09:40:23 -06:00
Jacques Distler
6e6bf1a446
Yikes! Yet more Ruby 1.9 Encoding Issues
...
We're getting there. Thanks to Andrew Stacey.
2010-01-05 09:35:14 -06:00
Jacques Distler
0cdbbbd9ff
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-04 18:46:00 -06:00
Jacques Distler
6cf1463525
Revert Revision 520; This is more thorough
...
This ensures that @page.name has the right (utf8)
encoding.
2010-01-04 18:43:27 -06:00
Jacques Distler
e417054a67
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-01-04 06:48:20 -06:00
Jacques Distler
d786e95a77
Ruby 1.9 + MySQL Hack
...
The default encoding in MySQL is latin1. Ruby 1.9
is a stickler about the encoding of a sequence of bytes.
In this case, a utf8 page name stored in the database comes
back as "ASCII-8BIT" (ie, binary). Coerce that back to utf8.
This doesn't affect SQLite3, and it doesn't affect Ruby 1.8.
It doesn't even affect MySQL databases with "utf8" encoding
(though that has other issues, since MySQL's utf8 support is
broken).
There are probably other, similar problems lurking.
2010-01-04 06:41:04 -06:00
Jacques Distler
ce46bd0929
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-31 15:56:22 -06:00
Jacques Distler
f66fc4de4d
Fenced Code Blocks, Fortran Syntax Colouring
...
Support Marhdown Extra's fenced code blocks. [From Jason Blevins]
Fortran syntax colouring. [From Jason Blevins]
Turn on Syntax colouring, by default.
Point to Michel Fortin's Markdown Extra page.
2009-12-31 15:54:01 -06:00
Jacques Distler
7e61bc10d7
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-27 00:57:51 -06:00
Jacques Distler
2780344a1b
Version 0.18
2009-12-27 00:55:48 -06:00
Jacques Distler
27eab3ee41
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-27 00:43:28 -06:00
Jacques Distler
b75aa4b8d6
Fix a broken test
2009-12-27 00:41:04 -06:00
Jacques Distler
dce19f6eda
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-26 23:47:38 -06:00
Jacques Distler
601331b508
Move Files When Renaming Web
...
Renaming a web should move the
corresponding subdirectory of webs/ .
Otherwise, links to uploaded files break.
2009-12-26 23:43:18 -06:00
Jacques Distler
47439e97c5
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2009-12-26 14:03:26 -06:00
Jacques Distler
a705709f9a
Vendor Rack 1.1
...
Also clean up some View stuff.
2009-12-26 14:00:18 -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
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