deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
1666 commits 3 branches 18 tags 34 MiB
Commit graph

1666 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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