Commit graph

1648 commits

Author SHA1 Message Date
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
Jacques Distler
e98c8bda63 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-12-01 11:14:14 -06:00
Jacques Distler
d8d0f2fdd6 Some Doc Updates 2010-12-01 11:12:45 -06:00
Jacques Distler
2cd2b09648 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-11-30 23:26:01 -06:00
Jacques Distler
fccb1e2b01 Update SVG-Edit 2010-11-30 23:23:58 -06:00
Jacques Distler
5918d4c26e Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-11-27 00:45:16 -06:00
Jacques Distler
f914a40fa9 Fix Maruku Math Bug
Reported by Andrew Stacey.
2010-11-27 00:43:22 -06:00
Jacques Distler
8d7381bb54 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-11-22 19:13:15 -06:00
Jacques Distler
cd674bbb36 Clean up a few before_filters 2010-11-22 19:11:21 -06:00
Jacques Distler
88291ee4a2 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-11-03 23:52:06 -05:00
Jacques Distler
4be1a58a24 Update RedCloth to 4.x
Use Bundler to manage RedCloth
gem. 4.x should be much faster
and less buggy. Unfortunately,
it doesn't support mixed
Textile/Markdown syntax. So
we keep an (appropriately
renamed) copy of 3.x around,
for the users of the "Mixed"
text filter.
2010-11-03 23:32:55 -05:00
Jacques Distler
06287a4ef5 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-25 09:25:46 -05:00
Jacques Distler
cca857ed3a Update MathJax
On Davide Cervone's advice,
I updated MathJax from the
1.0.1 release to the (less
buggy) Revision 615 of the
MathJax svn.
2010-10-25 09:21:44 -05:00
Jacques Distler
982ab38f43 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-25 00:56:55 -05:00
Jacques Distler
ad12997c1d OK ... you can have your PNGs
The iPhone, apparently, really needs
them. That sucks. The only resolution
is to not bundle MathJax in the (X)HTML
export.

Also: update SVG-Edit.
2010-10-25 00:42:36 -05:00
Jacques Distler
97434e097a Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-21 23:59:35 -05:00
Jacques Distler
bb17fbbe02 Included pages
Redirects and categories of included
pages should not be inherited.
(Suggestion of Andrew Stacey)
2010-10-21 23:58:04 -05:00
Jacques Distler
06f4f2cc98 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-18 08:27:06 -05:00
Jacques Distler
bf69cceb25 No PNGs for you!
I removed the png versions of the MathJax
fonts. Make the config reflect that.
2010-10-18 08:25:25 -05:00
Jacques Distler
10aa983337 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-17 22:32:58 -05:00
Jacques Distler
1663d9f5c8 MathJax
For those without MathML-capable browsers,
we present MathJax. It's crappy 'n slow,
but it's better than nothing.
2010-10-17 22:30:56 -05:00
Jacques Distler
d208728065 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-15 10:50:31 -05:00
Jacques Distler
cebd381d0d Instiki 0.19.1
tex_list, Rails 2.3.10, etc.
2010-10-15 10:47:59 -05:00
Jacques Distler
477adeffda Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-11 11:00:00 -05:00
Jacques Distler
46da49485f More bugs in tex_list
Fix some more bugs in the new
tex_list action.
Make the drag-reorder *not*
result in a (superfluous)
AJAX request.
2010-10-11 10:57:26 -05:00
Jacques Distler
a4776060a6 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-10 13:29:03 -05:00
Jacques Distler
8a989b1a7b Make reordering work in Ruby 1.8.x
I was fooled: Ruby 1.9 has ordered
hashes; 1.8 doesn't. So what I did
in Revision 689 works in Ruby 1.9,
but fails in 1.8.

Now we parse the POST params ourselves.
2010-10-10 13:24:05 -05:00
Jacques Distler
57397617cd Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-09 21:56:08 -05:00
Jacques Distler
b7806c12ce Update Scriptaculous
to 1.8.3. Perhaps this will
fix Marco's bug (which I cannot
reproduce).
2010-10-09 21:54:38 -05:00
Jacques Distler
5c576f66e9 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-09 15:42:19 -05:00
Jacques Distler
9c11c384d4 Some more tweaks to the tex_list feature 2010-10-09 15:41:25 -05:00
Jacques Distler
a64194806b Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-09 14:45:15 -05:00
Jacques Distler
7f7182afea A little CSS styling
Should make the drag target,
for re-ordering the pages,
a little more obvious.
2010-10-09 14:42:01 -05:00
Jacques Distler
a0a11c0bc8 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-09 11:22:37 -05:00
Jacques Distler
b1fcc93aa5 Test for text_list
Add a functional test for
the new feature.
2010-10-09 11:21:41 -05:00
Jacques Distler
3660f13c84 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-09 10:34:58 -05:00
Jacques Distler
fece5a3486 Drag to re-order
For the previous commit, allow the user
to change the order of the LaTeX output.
2010-10-09 10:33:11 -05:00
Jacques Distler
194f10e809 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-09 03:02:26 -05:00
Jacques Distler
aee4f8b3a9 Export Multiple Pages to TeX
Per a suggestion of Marco Gualtieri.
2010-10-09 02:57:37 -05:00
Jacques Distler
7011067525 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-06 16:08:12 -05:00
Jacques Distler
1c5df9e8b5 OK. Now that's done right.
Fixed the bug in SVG-Edit that
necessitated the previous rollback.
2010-10-06 16:06:49 -05:00
Jacques Distler
1caa4822c1 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-05 22:46:30 -05:00
Jacques Distler
0a95c855ba Revert changes to SVG-Edit from last commit
That was *bad* mojo ...
2010-10-05 22:45:31 -05:00
Jacques Distler
b5481a1454 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-05 21:09:22 -05:00
Jacques Distler
f6c818de8a LaTeX Export for \array
This will work for \array without
any options.

Also fix an SVG-Edit bug
2010-10-05 21:07:19 -05:00
Jacques Distler
5ca5bce628 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-05 10:10:13 -05:00
Jacques Distler
8aa3a9e929 SVG-Edit fixes
Some bugfixes from the latest SVG-Edit
2010-10-05 10:08:48 -05:00