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

1596 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jacques Distler
0d8f680d4f Updates 
SVG-Edit -> 2.5final
Vendored Rack -> 1.2.1
 2010-06-17 19:27:39 -05:00
Jacques Distler
95854d34b5 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-06-16 22:48:31 -05:00
Jacques Distler
6338a3bcb2 Update to latest SVG-Edit 2010-06-16 22:46:12 -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
9236140dde Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-06-10 22:44:58 -05:00
Jacques Distler
4f8759cdf3 Update vendored Sqlite3-ruby to 1.3.0 
Also, some tweaks to Maruku.
 2010-06-10 22:42:33 -05:00
Jacques Distler
5f6e1ce19f Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-06-09 13:28:23 -05:00
Jacques Distler
9a80cacc34 Update Sanitizer 
Support <menclose notation="...">.
 2010-06-09 13:26:51 -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
03c57473dc Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-06-04 12:13:36 -05:00
Jacques Distler
dead710e69 Revert #633 
MathPlayer doesn't like the HTML5 DOCTYPE.
Revert to sending XHTML+MathML+SVG DOCTYPE.
 2010-06-04 12:10:26 -05:00
Jacques Distler
940e9bd879 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-06-03 07:14:57 -05:00
Jacques Distler
05ffd215f1 SVG-Edit Markers Extension 
The arrows extension on steroids.
 2010-06-03 07:13:37 -05:00
Jacques Distler
3c5ad60de8 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-06-02 00:18:05 -05:00
Jacques Distler
c25b608f3d Maruku's string_utils.rb 
Wow! Totally un-Ruby-like.
This is more Ruby-like and
(hopefully) faster.
 2010-06-02 00:15:58 -05:00
Jacques Distler
8395508c85 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-06-01 10:41:31 -05:00
Jacques Distler
b7a3b8aa94 Minor Update From Current Maruku 2010-06-01 10:39:55 -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
55337ed43c Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-06-01 01:53:45 -05:00
Jacques Distler
17e9cfab87 IAL's for <li> elements 
Add a Markdown syntax for attaching
attribute lists to list items (for both
ordered and unordered lists).

The syntax is trivial:

1. This is the first item
2. {: value="3"} We skip straight to #3

* This is an item
* {: style="color:red"} This is a red item
 2010-06-01 01:50:19 -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
Jacques Distler
ad3fe74cfd Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-05-26 14:38:32 -05:00
Jacques Distler
b5a4e2fd9c Sync with latest SVG-Edit 2010-05-26 14:37:55 -05:00
Jacques Distler
d61ae49e66 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-05-26 14:17:52 -05:00
Jacques Distler
1da034e2be Fix some to-be-deprecated stuff 2010-05-26 14:16:34 -05:00
Jacques Distler
4774d7c8a1 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-05-26 01:28:03 -05:00
Jacques Distler
4b73f1a1ae More rails_xss Plugin fun 
:-(
 2010-05-26 01:27:09 -05:00
Jacques Distler
e3cbef7dcd Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-05-26 00:33:21 -05:00
Jacques Distler
a5e08f7bcc Rails_xss Plugin 
I installed the rails_xss plugin, for
the main purpose of seeing what will
break with Rails 3.0 (where the behaviour
of the plugin is the default). I think
I've fixed everything, but let me know if you
see stuff that is HTML-escaped, which
shouldn't be.

As a side benefit, we now use Erubis,
rather than ERB, to render templates.
They tell me it's faster ...
 2010-05-26 00:27:49 -05:00
Jacques Distler
5196df7575 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-05-25 13:01:31 -05:00
Jacques Distler
d6be09e0f0 Fix some Helper Methods 
It seems that (advertising to the contrary)
Rails's XSS Protection is enabled, by default
in 2.3.8. So needed to fix some helper methods.
 2010-05-25 12:59:35 -05:00
Jacques Distler
52f0dbb91c Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-05-25 12:46:37 -05:00
Jacques Distler
f0635301aa Update to Rails 2.3.8 2010-05-25 12:45:45 -05:00
Jacques Distler
3745e4d669 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-05-23 23:23:50 -05:00
Jacques Distler
6677b46cb4 A few more additions for the Sanitizer 2010-05-23 23:22:45 -05:00
Jacques Distler
f7b2a40cf6 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-05-22 16:12:35 -05:00
Jacques Distler
d2c4623bf7 HTML5 Doctype 2010-05-22 16:11:27 -05:00
Jacques Distler
3bfbb7736d Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-05-22 15:21:52 -05:00