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

1588 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jacques Distler 1205efacf2 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-09-26 12:59:19 -05:00
Jacques Distler eac323a657 Sync with SVG-Edit 
More improvements.
 2010-09-26 12:57:59 -05:00
Jacques Distler c6edd052f5 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-09-25 11:17:01 -05:00
Jacques Distler 08223b0f2d Update CHANGELOG and README 2010-09-25 11:16:04 -05:00
Jacques Distler 4396420cf3 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-09-25 02:00:43 -05:00
Jacques Distler 3097b47111 Erubis and Rubyzip 
Use Bundler to manage Erubis and Rubyzip.
(Remove the vendored versions.)
 2010-09-25 01:59:03 -05:00
Jacques Distler fad12903f4 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-09-25 00:43:17 -05:00
Jacques Distler 03fa32f140 Passenger Support 
To get Passenger to work smoothly
with our Bundler setup, need this file.
 2010-09-25 00:35:47 -05:00
Jacques Distler eee3929c4b Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-09-24 22:40:56 -05:00
Jacques Distler 4bf2e0d944 Bundler 
Remove the vendored sqlite3-ruby.
Instead, add support for Bundler
(which is vendored).

Before running the new Instiki,
do a 

   ruby bundle

which will install all of the needed gems
locally. (If you need to, tweak the contents
of Gemfile.)
 2010-09-24 22:36:30 -05:00
Jacques Distler c27dc2cea3 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-09-23 09:30:54 -05:00
Jacques Distler 399bd0d5a4 Update Fortran Syntax Highlighting 
Thanks to Jason Blevins
 2010-09-23 09:29:20 -05:00
Jacques Distler a099648554 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-09-13 17:06:53 -05:00
Jacques Distler d80003d502 SVG-Edit bugfix 2010-09-13 17:05:37 -05:00
Jacques Distler 04bb80be15 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-09-10 15:20:20 -05:00
Jacques Distler e5ca66ae41 Sync with SVG-Edit 2010-09-10 15:19:23 -05:00
Jacques Distler 7aa91e8b5c Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-09-09 01:00:23 -05:00
Jacques Distler 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
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 86d5e23f99 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-08-13 16:15:13 -05:00
Jacques Distler 113e0af736 Update SVG-Edit 
Version 2.5.1
 2010-08-13 16:14:19 -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 1dc14ec2da Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-07-22 14:16:31 -05:00
Jacques Distler 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
Jacques Distler 0a87548324 Fix breakage from Revision 664 
Noted by Andrew Stacey
 2010-07-22 12:44:14 -05:00
Jacques Distler 3bfc30231a Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-07-21 09:42:26 -05:00
Jacques Distler 267f4a51fc Don't escape web.additional_style 
Reported by Andrew Stacey
 2010-07-21 09:39:18 -05:00
Jacques Distler 63e4c43a54 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-07-20 21:57:31 -05:00
Jacques Distler 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
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 8f62d3009b Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-07-20 08:02:58 -05:00
Jacques Distler 29224d6bcc SVG-Edit update 2010-07-20 07:59:47 -05:00
Jacques Distler 0904001ef9 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-07-04 08:53:10 -05:00
Jacques Distler 39c2138f88 Update Vendored Erubis to 2.6.6 2010-07-04 08:51:53 -05:00
Jacques Distler 58f44326ae Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-06-22 08:29:12 -05:00
Jacques Distler c18c2f988d Update SVG-Edit Sanitizer 
plus some minor SVG-Edit tweaks.
 2010-06-22 08:26:15 -05:00
Jacques Distler 4c4f7a7b82 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-06-19 03:03:36 -05:00
Jacques Distler ce8578d2d0 Some Maruku Regexp Refactoring 2010-06-19 03:02:15 -05:00
Jacques Distler 30909ec927 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-06-17 19:33:05 -05:00
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