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

263 commits

Author SHA1 Message Date
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 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 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 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 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 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 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 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 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 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 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
Jacques Distler 1290dfc9ae Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-01 18:56:31 -05:00
Jacques Distler 105c1d79e7 LaTeX-style \sqrt[]{} 
Fix LaTeX macros so that both (TeX-style)
\root{}{} and (LaTeX-style) \sqrt[]{} can
appear in the same file. The latter will be
supported in the next version of itex2MML.
 2010-10-01 18:53:44 -05:00
Jacques Distler a5aa1b1fa8 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-09-05 15:26:17 -05:00
Jacques Distler ef30cc22df Update to Rails 2.3.9 and itextomml 1.3.27 2010-09-05 15:24:15 -05:00
Jacques Distler 7c9ab039c0 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-07-22 17:37:19 -05:00
Jacques Distler 8e57e97869 Some Tests for Revision 666 2010-07-22 17:36:37 -05:00
Jacques Distler 6602a153f7 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-07-20 20:38:01 -05:00
Jacques Distler b3aae9b06d Sqlite3-ruby 1.3.1, itextomml 1.3.26 
Update vendored sqlite3-ruby and tests
for latest itextmml.
 2010-07-20 20:36:17 -05:00
Jacques Distler 65fd56888f Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-06-13 23:21:22 -05:00
Jacques Distler 6491d70326 Update Vendored Rack to 1.2.0 
Also update tests for itextomml 1.3.25.
 2010-06-13 23:09:24 -05:00
Jacques Distler a14db81b79 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-06-09 12:00:55 -05:00
Jacques Distler 90ad482ed2 Rename stringsupport.rb => instiki_stringsupport.rb 2010-06-09 11:47:39 -05:00
Jacques Distler e4aa197c30 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-06-05 11:00:49 -05:00
Jacques Distler 3aaf3989c7 Test for divref Issue in Weizenbaum's Branch 2010-06-05 10:59:12 -05:00
Jacques Distler c4e2afa01a Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-06-04 21:39:02 -05:00
Jacques Distler 06ae79322a Maruku Cleanup Branch 
Use Nathan Weizenbaum's "cleanup" branch of
Maruku. There were a few evident problems
with his branch, so please report any
anomalies you see.
 2010-06-04 21:36:31 -05:00
Jacques Distler c54a7756b5 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-06-01 09:24:30 -05:00
Jacques Distler ad7e32c92c Tests for Revision 644 2010-06-01 09:22:37 -05:00
Jacques Distler 851b735158 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-05-30 13:36:04 -05:00
Jacques Distler b8647da41a Fix TeX Output 
\empty was causing problems.
That was kinda stupid.
 2010-05-30 13:34:30 -05:00
Jacques Distler 44e54ee4c6 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-05-27 01:18:06 -05:00
Jacques Distler dafe67046a Better 
Use :only_path => true
 2010-05-27 01:17:24 -05:00
Jacques Distler 1f4f1a4ba3 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-05-27 00:30:29 -05:00
Jacques Distler a57152d743 Fix Category Listing Bugs 
The links to the category listings
were bogus, and the category listing
page needed some XSS-unprotection.
 2010-05-27 00:27:49 -05:00