Commit Graph

496 Commits (master)

Author SHA1 Message Date
Jacques Distler def8e9ae0f Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-11-10 16:07:27 -06:00
Jacques Distler b52a66c207 Don't escape style_additions
Credit to Andrew Stacey
2011-11-10 16:03:54 -06:00
Jacques Distler 4a3d7e0b78 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-10-26 14:23:21 -05:00
Jacques Distler 57d52b0d15 I am a doofus
Noticed by Andrew Stacey
2011-10-26 14:21:01 -05:00
Jacques Distler 072e2e1e92 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-10-09 11:50:18 -05:00
Jacques Distler b48a56028a Avoid invalid WikiFile links
Reported by Andrew Stacey.
2011-10-09 11:47:04 -05:00
Jacques Distler 0f4a76d895 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-09-21 13:39:21 -05:00
Jacques Distler 4b09e0322f Another Cache-Sweeping efficiency 2011-09-21 13:37:33 -05:00
Jacques Distler 07aca55e6e Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-09-21 08:07:47 -05:00
Jacques Distler b6c0ffa0d5 A slight improvement in the efficiency of the Cache Sweeper
Suggested by Andrew Stacey
2011-09-20 23:46:36 -05:00
Jacques Distler 1f8a4fe282 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-09-09 11:35:26 -05:00
Jacques Distler eff8c87d39 Better 2011-09-09 11:33:41 -05:00
Jacques Distler 60a595de17 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-09-09 00:11:44 -05:00
Jacques Distler c603aca852 Expire pages that want file, when file is successfully uploaded
Reported by Andrew Stacey
2011-09-09 00:05:54 -05:00
Jacques Distler 8c74de6670 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-09-07 15:41:53 -05:00
Jacques Distler ee05118e8f Update for itextomml 1.4.7 2011-09-07 15:39:41 -05:00
Jacques Distler f5c892c717 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-09-03 11:35:37 -05:00
Jacques Distler 364de9dbab Better
3rd time's the charm?
2011-09-03 11:33:51 -05:00
Jacques Distler 1efa08dcc7 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-09-03 11:14:59 -05:00
Jacques Distler ddf1846fe1 Fix double-escaping of flash messages (for real, this time) 2011-09-03 11:12:49 -05:00
Jacques Distler 04ca7e8a38 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-08-31 11:59:26 -05:00
Jacques Distler f9e60828c7 Instiki 0.19.3 2011-08-31 11:57:20 -05:00
Jacques Distler 9e25ada5c8 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-08-27 22:01:07 -05:00
Jacques Distler 66f62bac1f Source view for Revisions 2011-08-27 21:58:14 -05:00
Jacques Distler b1d1f74b7d Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-08-27 16:34:33 -05:00
Jacques Distler a088201062 Null search
Search without a query-param should
not result in a application error.
2011-08-27 16:30:57 -05:00
Jacques Distler 09b2d24a18 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-08-22 11:02:44 -05:00
Jacques Distler e387d095ec Fix double-escaping on Search Page
Reported by Andrew Stacey
2011-08-22 11:00:03 -05:00
Jacques Distler 7d2275d0a1 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-07-28 23:18:14 -05:00
Jacques Distler 52da76ff38 These Flash messages are html_safe 2011-07-28 23:16:21 -05:00
Jacques Distler 8d7f33f99b Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-07-07 10:32:49 -05:00
Jacques Distler 2967b207b2 Update for itex2MML 1.4.6 2011-07-07 10:18:55 -05:00
Jacques Distler 97148dc205 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-06-11 23:42:34 -05:00
Jacques Distler cbf13ad57a Instiki 0.19.2
Bump version number.

Also update to a faster method
of loading MathJax (thanks to
Davide Cervone for assistance).
2011-06-11 23:39:42 -05:00
Jacques Distler 92e4aaafaf Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-06-04 01:16:08 -05:00
Jacques Distler 0ae83c3560 Prepare for 0.19.2 Release 2011-06-04 01:14:17 -05:00
Jacques Distler 1f98b7dcf9 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-06-01 14:36:53 -05:00
Jacques Distler 0df40cb4cb Update MathJax to 1.1 final 2011-06-01 14:35:18 -05:00
Jacques Distler c2dfe7e621 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-04-25 10:58:42 -05:00
Jacques Distler 7290e90631 Efficiency
Introduce page.rev_ids, and use
that, wherever possible, instead
of page.revisions.

This avoids fetching the text of
all the revisions. D'oh!
2011-04-25 10:54:44 -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 63fd1dbbb9 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2011-02-18 23:39:04 -06:00
Jacques Distler 844ce0ed40 Rails 2.3.11, S5 Editing bug.
Upgrade to Rails 2.3.11.
Fix a bug where the SVG-Edit button would not appear
when editing S5 slideshows.
2011-02-18 23:36:23 -06:00
Jacques Distler 8d7381bb54 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-11-22 19:13:15 -06:00
Jacques Distler cd674bbb36 Clean up a few before_filters 2010-11-22 19:11:21 -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 10aa983337 Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki 2010-10-17 22:32:58 -05:00
Jacques Distler 1663d9f5c8 MathJax
For those without MathML-capable browsers,
we present MathJax. It's crappy 'n slow,
but it's better than nothing.
2010-10-17 22:30:56 -05:00