8b5ce9b5319bf7fb3fff944d2c8a178eb344e6d3 Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/6e25204952a989722804ca928006bbd04209a920 6e25204952a989722804ca928006bbd04209a920

2009-09-13T07:53:30-07:00

Added failing test for Josh Nesbitt's fix 3585b1f8e8c77ea4a3047d18a0c7e888f7a9a270 Karel Minarik karmi@karmi.cz ad480e2ca87de1412a84befc7591636190f3be9d Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/5ec861b36033d585c16abbbbaf307e52c51ef730 5ec861b36033d585c16abbbbaf307e52c51ef730

2009-04-13T15:53:35-07:00

Remove hardcoded values in Githubber class for displaying "Running on revision ..." information 451ce1b1cd00965e48a5c66cdf6d3577521eb4d8 Karel Minarik karmi@karmi.cz 402b30b41d6b690038606d83a9c56169be7bf637 Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/ad480e2ca87de1412a84befc7591636190f3be9d ad480e2ca87de1412a84befc7591636190f3be9d

2009-04-13T15:25:39-07:00

2009-04-13T15:24:47-07:00

Load also draft articles in :development environment 6cd4d2cc32795f680603951423f67d07464159c1 Karel Minarik karmi@karmi.cz 233c8570c8c223630c41d569b4ffb8fa4ac37f61 Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/402b30b41d6b690038606d83a9c56169be7bf637 402b30b41d6b690038606d83a9c56169be7bf637

2009-04-13T15:25:34-07:00

2009-04-13T15:24:07-07:00

Allow re-loading lib files in :development environment be026041fbc412cc2487f2157805e290104cd34b Karel Minarik karmi@karmi.cz dbf2e521e363eb6752598357ef175c80ebf6a78e Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/233c8570c8c223630c41d569b4ffb8fa4ac37f61 233c8570c8c223630c41d569b4ffb8fa4ac37f61

2009-04-13T15:25:29-07:00

2009-04-13T15:22:34-07:00

Cleanup logic in Post.find_one() and allow loading draft articles in :development environment c9247bdb2e50a579590255f209b554506e06be7c Karel Minarik karmi@karmi.cz be7e62a7aecb31c86cd2104b7e2c37014c358826 Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/b3681c5197449f267fdca2544c827a25275d9804 b3681c5197449f267fdca2544c827a25275d9804

2009-02-17T06:07:38-08:00

Fix and cleanup "Running on revision ..." info : use timeout when talking to Github, use memoization in Marley::Configuration. Added TODO that we need to get user/repo info from parsing `git remote -v`, not hardcode stupid values like "karmi" and "marley" 881bec3cd4ee8c1da911390d784fdd5dc0f8968c Karel Minarik karmi@karmi.cz 14a828a50379a2a2a5b8ebdb0cfcdd614e4686ac Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/be7e62a7aecb31c86cd2104b7e2c37014c358826 be7e62a7aecb31c86cd2104b7e2c37014c358826

2009-02-17T05:13:05-08:00

Stricter Regexp for finding article/directory by ID, does not allow for partial matches (/introducing-marl/) from now on + Added test coverage + Test asserts cleanup b58e6c0e82869c89e07d3f55ac0da0fbd80af1bf Karel Minarik karmi@karmi.cz f124f12f2c792a21ae55df92b98a654434e05b5c Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/14a828a50379a2a2a5b8ebdb0cfcdd614e4686ac 14a828a50379a2a2a5b8ebdb0cfcdd614e4686ac

2009-02-17T05:11:31-08:00

Return empty Hash (not nil) for article meta-data bdd1a013614509b6d6da212f97627c6600017ca7 Karel Minarik karmi@karmi.cz facab9ed5cd84be1016eb37a072abc6b99a71fc7 Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/f124f12f2c792a21ae55df92b98a654434e05b5c f124f12f2c792a21ae55df92b98a654434e05b5c

2009-02-17T02:37:56-08:00

Show how to use metadata info (such as categories) in example post (001-test-article-one) + implement in default theme + CSS 3b497003daf1ec4e0890aa1704d9c98a9111ed02 Karel Minarik karmi@karmi.cz c17e133a03f818270bbfdfae15a1a88b49753208 Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/facab9ed5cd84be1016eb37a072abc6b99a71fc7 facab9ed5cd84be1016eb37a072abc6b99a71fc7

2009-02-17T02:36:37-08:00

Create database and schema in configure block for :development and :production when not present, to be more flexible 98e67c7d80c71175c77697f656aaacd35637e114 Karel Minarik karmi@karmi.cz bd904c0add61114ff989e25f6dbb18dcd314efc2 Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/83267e59c629e5d8345e24a1fd08f3330f1994e3 83267e59c629e5d8345e24a1fd08f3330f1994e3

2009-02-16T13:09:43-08:00

Err, FIX the ham issue b7264efa8ad26f3528f47206d21dd72344ab1614 Karel Minarik karmi@karmi.cz 15704653081013580d209b6f6f359c74ee065e92 Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/045454aa37da0165409fc9f6126fccafad2f4790 045454aa37da0165409fc9f6126fccafad2f4790

2009-02-16T13:00:53-08:00

2009-02-16T12:51:49-08:00

Display only ham comments on page. Spammers are getting a wee bit tiresome. 2abf2335b6b1b0d9c1d08fece43c816d1b48e234 Karel Minarik karmi@karmi.cz ed63c0bee69175b4cc9604af0d30d0d3e987eb4c Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/15704653081013580d209b6f6f359c74ee065e92 15704653081013580d209b6f6f359c74ee065e92

2009-02-14T13:45:50-08:00

[FIX] Take care of nil issue in ga_code c59310513ddb2a97048571fab0bacd3cbb76190a Karel Minarik karmi@karmi.cz 42f9deaf95f51aa33bbd8442253964664753006b Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/21514ccf2d82e903cfb4b8bd7f6e1959069d9a5d 21514ccf2d82e903cfb4b8bd7f6e1959069d9a5d

2009-02-14T07:35:49-08:00

Require Akismetor in Marley::Comment if not present b8c7527cf7edf7e991d303124888f3f4444e7ec7 Karel Minarik karmi@karmi.cz 84022de0036df02c59ba625442dfdb87901edc12 Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/79f4cd5da484cb50a2800f5a4270441c482455ed 79f4cd5da484cb50a2800f5a4270441c482455ed

2009-02-14T07:31:06-08:00

Add Rake and Capistrano task for easily pruning spam. TODO: Run `rake manage:spam:prune` with cron each Monday 9bf41d00d12a303f4797f8753c46a5546188a5c0 Karel Minarik karmi@karmi.cz 80f8c2a628d95f27e3c2d5e14ce43cd1afcf1afa Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/84022de0036df02c59ba625442dfdb87901edc12 84022de0036df02c59ba625442dfdb87901edc12

2009-02-14T05:03:39-08:00

Un-private the Comment#report_as_spam method 3ee21d70d4bf9773e1b301deb886ff96f071f147 Karel Minarik karmi@karmi.cz 8366eea6feb76fbb9f6c263ece837215f0de85d0 eb86ed668af65d1599dfe24844d248d79943113d Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/86f3659dc26d701c2564d20e5d0105d75ed87461 86f3659dc26d701c2564d20e5d0105d75ed87461

2009-02-14T04:53:42-08:00

Merge branch 'master' into restafari_org ba5a34f269fffaaac83907bba2dd7a5c3a3cbe30 Karel Minarik karmi@karmi.cz e4df72e46c45800dc732b040478099c361022bac Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/28a9de227396c576bd09cce5eccaa5a5456b28f9 28a9de227396c576bd09cce5eccaa5a5456b28f9

2009-02-14T04:51:32-08:00

Add tests for HTTP authorization 488dccde00f4552d071c5b63a1c619411f3617b9 Karel Minarik karmi@karmi.cz ab60bf1812b27a0662298bfbb11cd496f451edc0 Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/e4df72e46c45800dc732b040478099c361022bac e4df72e46c45800dc732b040478099c361022bac

2009-02-14T04:43:16-08:00

Add Marley Admin Panel to default theme + Cleanup infrastructure for deleting spam comments. Try URL like http://localhost:4567/admin/your-article.html to check it. 67ee0a04cb83251bba8f16bef7a95b46a7d2e74b Karel Minarik karmi@karmi.cz 24c34b553e5d2b7c8de064358cc397993c77d08c Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/ab60bf1812b27a0662298bfbb11cd496f451edc0 ab60bf1812b27a0662298bfbb11cd496f451edc0

2009-02-14T04:13:35-08:00

Add support for HTTP Auth in application + Add infrastructure to report comments as spam in Marley::Comment and in views 647ea8744f123cb1c55b694c3f06424d8549fbce Karel Minarik karmi@karmi.cz 581f78bd190e8e25ba822ee50084a41a4c0fe2c6 fc990b4587cbd9a2b5578971e848430d04040579 Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/8366eea6feb76fbb9f6c263ece837215f0de85d0 8366eea6feb76fbb9f6c263ece837215f0de85d0

2009-02-14T03:17:56-08:00

Merge branch 'refactoring' into restafari_org 3b581c8bda8bcd0077e5f7a8c768b0ec37b83e1e Karel Minarik karmi@karmi.cz 7bc54d736595a0d704f915c1ca0436593866d448 Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/fc990b4587cbd9a2b5578971e848430d04040579 fc990b4587cbd9a2b5578971e848430d04040579

2009-02-14T03:17:08-08:00

Cleaned up Rack config & Rake tasks for start/stop/restart Thin in production 7f79149090d40eeadfa0e0794bbeba847044ff95 Karel Minarik karmi@karmi.cz dbce98d06173d879b055d010f69810b76cf980db e91a8e53d0adc03f1f53a9224cf0c17ac7e3d71b Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/eba59b4c12c892199288d3fa2d725f8679576a83 eba59b4c12c892199288d3fa2d725f8679576a83

2009-02-14T02:02:37-08:00

Merge branch 'master' into restafari_org Conflicts: README.rdoc Rakefile app/lib/comment.rb app/lib/post.rb app/marley.rb app/public app/public/stylesheets/print.css app/public/stylesheets/safari.css app/test/marley_test.rb app/views config/deploy.example.rb themes/restafari/views/layout.erb 7c7c4394c3ed22b6ca7e11a9ccc38d83c0bad6ec Karel Minarik karmi@karmi.cz 560d5f2c74fc5bc936d8c6fa626ea7f4a7e280cb Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/e91a8e53d0adc03f1f53a9224cf0c17ac7e3d71b e91a8e53d0adc03f1f53a9224cf0c17ac7e3d71b

2009-02-14T01:44:24-08:00

Remove dependency on Edge Sinatra, runs on current 0.9.0.4 just fine. Leave sinatra-sinatra in vendor as gitmodule so we can quickly try new stuff. 470702d37d238287a4fd81c5264dc2cf1bef9102 Karel Minarik karmi@karmi.cz 54009ca49775476ddb30c285f34dc7bb9907b3be Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/560d5f2c74fc5bc936d8c6fa626ea7f4a7e280cb 560d5f2c74fc5bc936d8c6fa626ea7f4a7e280cb

2009-02-14T01:43:37-08:00

Prune/expand in-code comments 8b8ccb8255485b39872428a2db4761efe837bf2c Karel Minarik karmi@karmi.cz ee6c6cfab16c76501de49b97550e7d0590a39ada Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/54009ca49775476ddb30c285f34dc7bb9907b3be 54009ca49775476ddb30c285f34dc7bb9907b3be

2009-02-14T01:41:16-08:00

FIX tests and handle re-configuration for tests 7b7fa921337c6c659a37411a9afa98ef56516153 Karel Minarik karmi@karmi.cz c7b9a46a57779c136410870056a804b9297d28e2 Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/bf0c4b5478a08790a705106a5b91090695fd2835 bf0c4b5478a08790a705106a5b91090695fd2835

2009-02-14T01:21:24-08:00

Readme cleanups and updates 3ef1327710da1401da44548625524a2db3f50738 Karel Minarik karmi@karmi.cz 0e3a8d7cb306e16dcf04263922b95a7877a12421 Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/c7b9a46a57779c136410870056a804b9297d28e2 c7b9a46a57779c136410870056a804b9297d28e2

2009-02-13T15:40:13-08:00

Shift all files from "views" and "public" into "themes/default" directory. 4646152458418c761e3c07f31bcb8b63e26653f2 Karel Minarik karmi@karmi.cz 04351ec138d391ad71daba11d10feee222a78535 Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/0e3a8d7cb306e16dcf04263922b95a7877a12421 0e3a8d7cb306e16dcf04263922b95a7877a12421

2009-02-13T14:50:11-08:00

Clean-up of theme related configuration stuff, so we can actually implement themes in some sane way ba0df058fbd4e82450bf2bd6e622a4ca234e9df2 Karel Minarik karmi@karmi.cz 0071a3033e2c37d0eaac947332dab34b6c2b9ecf Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/327750d836280a9cc3f3f5e3ff54d681220b4089 327750d836280a9cc3f3f5e3ff54d681220b4089

2009-02-09T01:59:20-08:00

Cleaned up app configuration: ripped out all constants, implemented Marley::Configuration as class, loaded YAML nested hashes into nested OpenStruct Now we can write reasonably well: Marley::Configuration.blog.title etc, without needing extra lib/gem 4950aab09d01b6dac6d9bc488270b932ed1aba46 Karel Minarik karmi@karmi.cz 5426186ef809017f206bf0e9bb1f51c0c00f5b67 Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/0071a3033e2c37d0eaac947332dab34b6c2b9ecf 0071a3033e2c37d0eaac947332dab34b6c2b9ecf

2009-02-09T01:06:33-08:00

Clean up loading process and configuration a89b346b8b311c367617431b0f224e4db1d4b8ce Karel Minarik karmi@karmi.cz 365db7bbfab95fca8c7cc7cc37cc785d2c15fd4d Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/5426186ef809017f206bf0e9bb1f51c0c00f5b67 5426186ef809017f206bf0e9bb1f51c0c00f5b67

2009-02-06T15:23:38-08:00

First pass on initialization cleanup. Next stop: Configuration. ff2448646b9b4c00a92547de2227b875096f17e0 Karel Minarik karmi@karmi.cz b9122a500158826a44fe5119f93a908c9cabada0 Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/365db7bbfab95fca8c7cc7cc37cc785d2c15fd4d 365db7bbfab95fca8c7cc7cc37cc785d2c15fd4d

2009-02-06T15:22:33-08:00

Update tests for new Sinatra 0a2f0e790153f134a942c05ed898e2b0abc7b68e Karel Minarik karmi@karmi.cz 552bc040120a65561721db38a3fc7833f4ada3a3 Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/b9122a500158826a44fe5119f93a908c9cabada0 b9122a500158826a44fe5119f93a908c9cabada0

2009-02-03T02:16:39-08:00

Add route for article assets (eg. GET "/123-my-article/image.png") cb96f58b64c968f2c15862c77679ec4e224dc589 Karel Minarik karmi@karmi.cz c013049aa41d0facb37373e35b9e8006dc6ebce6 Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/552bc040120a65561721db38a3fc7833f4ada3a3 552bc040120a65561721db38a3fc7833f4ada3a3

2009-02-03T02:16:09-08:00

Require edge Sinatra in marley.rb now d33ee0bc908d736b274fc1df8a3b76052732b66b Karel Minarik karmi@karmi.cz