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

235 commits

Author SHA1 Message Date
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
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
2df08e21d1 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-03-02 16:07:08 -06:00
Jacques Distler
7b22daa784 Fix Revision 601 
With tests, this time.
 2010-02-28 23:51:33 -06:00
Jacques Distler
3a9d1596d2 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-01-26 00:21:50 -06:00
Jacques Distler
bafa7743f1 Allow Periods in Page Names 
Thanks to Jeff Zellman.
 2010-01-26 00:18:30 -06:00
Jacques Distler
711a98ccfb Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-01-25 22:06:13 -06:00
Jacques Distler
cbb3e4b74f Less Grotty 
Does what Revision 535 does, but
slightly less ugly.
 2010-01-25 22:01:10 -06:00
Jacques Distler
820d2a94eb Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-01-25 18:46:11 -06:00
Jacques Distler
9dc59b7b7c Fix BlahTeX/PNG Path 
Dunno why Ari tolerated this
up till now.
 2010-01-25 17:55:31 -06:00
Jacques Distler
a7d38ef6a1 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-01-23 18:12:23 -06:00
Jacques Distler
8ed5a88db0 Fix Zip Export and Print View 
Fix http://bug.to/issues/show/335
and
http://bug.to/issues/show/334

We now bundle the uploaded files directory
(and the public/ directory for the (X)HTML
export) in the Zipball when exporting a Web.

Also, correct the Print View to produce proper links
uploaded files.
 2010-01-23 18:01:02 -06:00
Jacques Distler
6a5b0e108a Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-01-07 00:10:35 -06:00
Jacques Distler
0c2bc65e7a All I want for Christmas ... 
... is to settle these encoding issues 
once and for all.

Let's override the accessor methods, which 
seems to offer a simpler solution.

Now with tests (for whatever that helps)...
 2010-01-06 08:15:34 -06:00
Jacques Distler
036f6335ad Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-01-05 09:40:23 -06:00
Jacques Distler
6e6bf1a446 Yikes! Yet more Ruby 1.9 Encoding Issues 
We're getting there. Thanks to Andrew Stacey.
 2010-01-05 09:35:14 -06:00
Jacques Distler
0cdbbbd9ff Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-01-04 18:46:00 -06:00
Jacques Distler
6cf1463525 Revert Revision 520; This is more thorough 
This ensures that @page.name has the right (utf8)
encoding.
 2010-01-04 18:43:27 -06:00
Jacques Distler
0cfea84802 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-01-03 13:23:26 -06:00
Jacques Distler
e3aa626489 Better Display of Interweb Wikilinks 
Perhaps not the most creative use of CSS. But,
at least, this will read better.
 2010-01-03 13:19:47 -06:00
Jacques Distler
27eab3ee41 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-12-27 00:43:28 -06:00
Jacques Distler
b75aa4b8d6 Fix a broken test 2009-12-27 00:41:04 -06:00
Jacques Distler
dce19f6eda Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-12-26 23:47:38 -06:00
Jacques Distler
601331b508 Move Files When Renaming Web 
Renaming a web should move the
corresponding subdirectory of webs/ .
Otherwise, links to uploaded files break.
 2009-12-26 23:43:18 -06:00
Jacques Distler
47941683ab Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-12-14 17:43:53 -06:00
Jacques Distler
d3e79ea84a Make truncate() Unicode-aware 2009-12-14 17:41:28 -06:00
Jacques Distler
085783d308 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2009-12-14 02:07:56 -06:00
Jacques Distler
2c5e5a0015 Refactoring 
Move the truncate() method into ApplicationHelper.
Move another method around, for no particularly
good reason. Controllers really shouldn't have
public methods that don't correspond to actions.
 2009-12-14 02:01:50 -06:00