e5ca66ae41
Sync with SVG-Edit
2010-09-10 15:19:23 -05:00
7aa91e8b5c
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-09-09 01:00:23 -05:00
e99fcf720c
Make Vendored Rack work with Ruby 1.9.2-p0
...
Seemed to have no troubles with 1.9.2dev. But
with the release version, Instiki would fail to
launch, with a
`load_missing_constant': Rack is not missing constant Handler! (ArgumentError)
error.
2010-09-09 00:57:35 -05:00
a5aa1b1fa8
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-09-05 15:26:17 -05:00
ef30cc22df
Update to Rails 2.3.9 and itextomml 1.3.27
2010-09-05 15:24:15 -05:00
86d5e23f99
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-08-13 16:15:13 -05:00
113e0af736
Update SVG-Edit
...
Version 2.5.1
2010-08-13 16:14:19 -05:00
7c9ab039c0
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-07-22 17:37:19 -05:00
8e57e97869
Some Tests for Revision 666
2010-07-22 17:36:37 -05:00
1dc14ec2da
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-07-22 14:16:31 -05:00
f6e9d17f9b
Non-Latin WikiWords
...
Fix bug in WikiWord processing
reproted by Alexander Hambug.
Also fix Cyrillic Capital/Lowercase
regexps.
2010-07-22 14:08:21 -05:00
0a87548324
Fix breakage from Revision 664
...
Noted by Andrew Stacey
2010-07-22 12:44:14 -05:00
3bfc30231a
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-07-21 09:42:26 -05:00
267f4a51fc
Don't escape web.additional_style
...
Reported by Andrew Stacey
2010-07-21 09:39:18 -05:00
63e4c43a54
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-07-20 21:57:31 -05:00
4576a7f7df
Remove Unneeded PHP files
...
We don't use these, so there's no point
in having them in our bundled SVG-Edit.
2010-07-20 21:56:10 -05:00
6602a153f7
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-07-20 20:38:01 -05:00
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
8f62d3009b
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-07-20 08:02:58 -05:00
29224d6bcc
SVG-Edit update
2010-07-20 07:59:47 -05:00
0904001ef9
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-07-04 08:53:10 -05:00
39c2138f88
Update Vendored Erubis to 2.6.6
2010-07-04 08:51:53 -05:00
58f44326ae
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-06-22 08:29:12 -05:00
c18c2f988d
Update SVG-Edit Sanitizer
...
plus some minor SVG-Edit tweaks.
2010-06-22 08:26:15 -05:00
4c4f7a7b82
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-06-19 03:03:36 -05:00
ce8578d2d0
Some Maruku Regexp Refactoring
2010-06-19 03:02:15 -05:00
30909ec927
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-06-17 19:33:05 -05:00
0d8f680d4f
Updates
...
SVG-Edit -> 2.5final
Vendored Rack -> 1.2.1
2010-06-17 19:27:39 -05:00
95854d34b5
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-06-16 22:48:31 -05:00
6338a3bcb2
Update to latest SVG-Edit
2010-06-16 22:46:12 -05:00
65fd56888f
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-06-13 23:21:22 -05:00
6491d70326
Update Vendored Rack to 1.2.0
...
Also update tests for itextomml 1.3.25.
2010-06-13 23:09:24 -05:00
9236140dde
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-06-10 22:44:58 -05:00
4f8759cdf3
Update vendored Sqlite3-ruby to 1.3.0
...
Also, some tweaks to Maruku.
2010-06-10 22:42:33 -05:00
5f6e1ce19f
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-06-09 13:28:23 -05:00
9a80cacc34
Update Sanitizer
...
Support <menclose notation="...">.
2010-06-09 13:26:51 -05:00
a14db81b79
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-06-09 12:00:55 -05:00
90ad482ed2
Rename stringsupport.rb => instiki_stringsupport.rb
2010-06-09 11:47:39 -05:00
e4aa197c30
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-06-05 11:00:49 -05:00
3aaf3989c7
Test for divref Issue in Weizenbaum's Branch
2010-06-05 10:59:12 -05:00
c4e2afa01a
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-06-04 21:39:02 -05:00
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
03c57473dc
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-06-04 12:13:36 -05:00
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
940e9bd879
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-06-03 07:14:57 -05:00
05ffd215f1
SVG-Edit Markers Extension
...
The arrows extension on steroids.
2010-06-03 07:13:37 -05:00
3c5ad60de8
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-06-02 00:18:05 -05:00
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
8395508c85
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
2010-06-01 10:41:31 -05:00
b7a3b8aa94
Minor Update From Current Maruku
2010-06-01 10:39:55 -05:00
Jacques Distler