Jacques Distler
6005297cfe
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-08 01:55:44 -05:00
Jacques Distler
46da1f3aaf
Tweaks to lib/chunks/engines.rb
2011-08-08 01:54:06 -05:00
Jacques Distler
a72d35bd4e
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-08 01:46:38 -05:00
Jacques Distler
201c25ce83
Small tweaks to Maruku
...
A real speedup could be had by redoing output/to_html.rb
2011-08-08 01:44:01 -05:00
Jacques Distler
c9312367c9
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-05 09:09:12 -05:00
Jacques Distler
47996ea1d3
Fix tests for above.
...
Set does not have a 'last' method.
2011-08-05 09:06:44 -05:00
Jacques Distler
f23e1487df
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-08-05 02:02:43 -05:00
Jacques Distler
14592f57f9
Some small efficiencies in the Chunk-handler
...
Also, log Maruku's processing time, out of perverse
interest.
2011-08-05 01:59:18 -05:00
Jacques Distler
7d2275d0a1
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-07-28 23:18:14 -05:00
Jacques Distler
52da76ff38
These Flash messages are html_safe
2011-07-28 23:16:21 -05:00
Jacques Distler
8d7f33f99b
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-07-07 10:32:49 -05:00
Jacques Distler
2967b207b2
Update for itex2MML 1.4.6
2011-07-07 10:18:55 -05:00
Jacques Distler
dfad5a3a37
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-06-18 15:57:54 -05:00
Jacques Distler
8b008f8418
Fix Maruku Footnote Backlink
...
Problem reported by Shamaoke.
2011-06-18 15:54:32 -05:00
Jacques Distler
fc8be60634
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-06-15 00:50:37 -05:00
Jacques Distler
9e909d5be3
Update Rails, rails_xss and Bundler
...
Update Bundler to 1.0.15.
Update Rails to 2.3.12.
Update rails_xss plugin.
The latter two were the
source of a considerable
amount of grief, as rails_xss
is now MUCH stricter about what
string methods can be used.
Also made it possible to use
rake 0.9.x with Instiki. But
you probably REALLY want to use
ruby bundle exec rake ...
instead of just saying
rake ....
2011-06-15 00:43:38 -05:00
Jacques Distler
088b535d52
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-06-12 12:59:12 -05:00
Jacques Distler
ec443685a6
MathJax 1.1a final
2011-06-12 12:57:10 -05:00
Jacques Distler
97148dc205
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-06-11 23:42:34 -05:00
Jacques Distler
cbf13ad57a
Instiki 0.19.2
...
Bump version number.
Also update to a faster method
of loading MathJax (thanks to
Davide Cervone for assistance).
2011-06-11 23:39:42 -05:00
Jacques Distler
ec31e46e92
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-06-09 08:36:27 -05:00
Jacques Distler
79a966f71f
Fix Ordered Lists
...
Fix a regression in Maruku.
(Reported by Andrew Stacey.)
2011-06-09 08:30:23 -05:00
Jacques Distler
92e4aaafaf
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-06-04 01:16:08 -05:00
Jacques Distler
0ae83c3560
Prepare for 0.19.2 Release
2011-06-04 01:14:17 -05:00
Jacques Distler
1464e29f4f
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-06-03 02:05:24 -05:00
Jacques Distler
fcd8900cb7
Update MathJax to 1.1a-candidate
2011-06-03 02:03:06 -05:00
Jacques Distler
9090dba2b2
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-06-01 15:29:56 -05:00
Jacques Distler
ade1c1d113
Update SVG-Edit
2011-06-01 15:28:11 -05:00
Jacques Distler
1f98b7dcf9
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-06-01 14:36:53 -05:00
Jacques Distler
0df40cb4cb
Update MathJax to 1.1 final
2011-06-01 14:35:18 -05:00
Jacques Distler
95d2fe540f
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-06-01 13:20:29 -05:00
Jacques Distler
c9ad2c0c6e
Non-ASCII Lists
...
Fix a bug in Maruku's
list-parsing.
Also fix a test broken
by latest Rack + Ruby 1.9.
2011-06-01 13:17:23 -05:00
Jacques Distler
ca661ddb42
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-06-01 12:29:31 -05:00
Jacques Distler
7e5dbe5854
Unvendor Rack
...
You'll need to rerun
ruby bundle
as rack is now loaded as gem.
2011-06-01 12:26:50 -05:00
Jacques Distler
c2dfe7e621
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-04-25 10:58:42 -05:00
Jacques Distler
7290e90631
Efficiency
...
Introduce page.rev_ids, and use
that, wherever possible, instead
of page.revisions.
This avoids fetching the text of
all the revisions. D'oh!
2011-04-25 10:54:44 -05:00
Jacques Distler
823f8b79c9
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-04-24 16:12:38 -05:00
Jacques Distler
c010e6b7a4
Validate Web address
...
When changing the address of an existing Web
(or creating a new one), check that the new name is valid.
(Reported by Richard Marquez.)
2011-04-24 16:07:43 -05:00
Jacques Distler
63fd1dbbb9
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-02-18 23:39:04 -06:00
Jacques Distler
844ce0ed40
Rails 2.3.11, S5 Editing bug.
...
Upgrade to Rails 2.3.11.
Fix a bug where the SVG-Edit button would not appear
when editing S5 slideshows.
2011-02-18 23:36:23 -06:00
Jacques Distler
f9628a3f19
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-02-18 13:13:43 -06:00
Jacques Distler
3843fa608d
Nasty!
...
How did a well-formedness bug creep into
the code? I *swear* this used to work.
2011-02-18 12:39:19 -06:00
Jacques Distler
363d72524b
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-02-03 11:15:12 -06:00
Jacques Distler
1bef71bbf1
Update SVG-Edit
2011-02-03 11:13:18 -06:00
Jacques Distler
122783886f
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-01-31 22:20:25 -06:00
Jacques Distler
a12a778c5a
Update SVG-Edit
...
Hyperlinking, among other new features.
2011-01-31 22:15:28 -06:00
Jacques Distler
c61eb7ae1e
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2011-01-27 19:13:51 -06:00
Jacques Distler
7d3f9db8f0
Update MathJax to Version 1.1-beta
2011-01-27 19:12:00 -06:00
Jacques Distler
230d2998b4
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-12-06 21:17:16 -06:00
Jacques Distler
27a99e0146
Update Vendored Bundler to 1.0.7
2010-12-06 21:11:19 -06:00