3160d407f97a1b4f23415ca980fb0db2fc7fefe9 2adcb7148169d300af17cb03e199cda6553148b3 James Cox james@imaj.es http://github.com/imajes/radiant/commit/044f7a587d88de445644f502c28664e58704a46e 044f7a587d88de445644f502c28664e58704a46e

2009-09-24T14:50:21-07:00

Merge remote branch 'upstream/master' 6b124bfb9713697e1962da0477a03b8dc432aa2d James Cox james@imaj.es 7afd22d15a0fa2ebf2659e1d86466d886dcb54fe James Cox james@imaj.es http://github.com/imajes/radiant/commit/3160d407f97a1b4f23415ca980fb0db2fc7fefe9 3160d407f97a1b4f23415ca980fb0db2fc7fefe9

2009-09-24T14:40:20-07:00

remove dispatchers.. 3a55088180f282f2148edeca0cf0c98c5e640459 James Cox james@imaj.es 997fa3698935f83defa2657a6572a13c6a6e0206 Jim Gay jim@saturnflyer.com http://github.com/imajes/radiant/commit/2adcb7148169d300af17cb03e199cda6553148b3 2adcb7148169d300af17cb03e199cda6553148b3

2009-09-23T09:22:12-07:00

Revert "Merge branch 'tab'" This reverts commit 997fa3698935f83defa2657a6572a13c6a6e0206. f291983711ae7f032065ada97d40f73b0fd7a28b Jim Gay jim@saturnflyer.com 1afeb3f61a5680a17eb2bbe6726ad11c3b8da11a edd1152f6c066ae96d066000d92e78f5a26593f5 Jim Gay jim@saturnflyer.com http://github.com/imajes/radiant/commit/997fa3698935f83defa2657a6572a13c6a6e0206 997fa3698935f83defa2657a6572a13c6a6e0206

2009-09-23T08:00:11-07:00

Merge branch 'tab' b092faf191b15271f1e6c28b3e2b6e35ae4b3ae7 Jim Gay jim@saturnflyer.com 7a943a60df7f7e592ccd90342e9d0f40e52b1d42 Jim Gay jim@saturnflyer.com http://github.com/imajes/radiant/commit/edd1152f6c066ae96d066000d92e78f5a26593f5 edd1152f6c066ae96d066000d92e78f5a26593f5

2009-09-23T07:57:55-07:00

simpler visibility checking, fix failing spec, update history 56d34ece65f23b947216af20574be25b3296ed46 Jim Gay jim@saturnflyer.com 19ffcae80aa649142ae89ae040edf56fbd5bec64 johnmuhl git@johnmuhl.com http://github.com/imajes/radiant/commit/1afeb3f61a5680a17eb2bbe6726ad11c3b8da11a 1afeb3f61a5680a17eb2bbe6726ad11c3b8da11a

2009-09-21T22:04:20-07:00

2009-09-20T13:51:21-07:00

<div> is not allowed inside <p>. doing so triggers error correction in browsers. f291983711ae7f032065ada97d40f73b0fd7a28b johnmuhl git@johnmuhl.com 7545b5b47181520ed2634d9b10b0f403d1e53335 johnmuhl git@johnmuhl.com http://github.com/imajes/radiant/commit/19ffcae80aa649142ae89ae040edf56fbd5bec64 19ffcae80aa649142ae89ae040edf56fbd5bec64

2009-09-21T22:03:13-07:00

2009-09-17T22:01:47-07:00

use the html5 doctype 56a14691d61a6cd91bed782502f8ac55cd2d7a74 johnmuhl git@johnmuhl.com 4e7ec37f82dfb561bba7e1e9738a24f205618f54 johnmuhl git@johnmuhl.com http://github.com/imajes/radiant/commit/7545b5b47181520ed2634d9b10b0f403d1e53335 7545b5b47181520ed2634d9b10b0f403d1e53335

2009-09-21T22:02:23-07:00

2009-09-20T12:58:58-07:00

concatenate admin javascript files dbea40106d12f75215fa0c67407c5fa780ce312b johnmuhl git@johnmuhl.com cfc3addb6f7b201bd20f60eb3811cecd05b3429b johnmuhl git@johnmuhl.com http://github.com/imajes/radiant/commit/4e7ec37f82dfb561bba7e1e9738a24f205618f54 4e7ec37f82dfb561bba7e1e9738a24f205618f54

2009-09-21T21:56:12-07:00

2009-09-20T13:41:25-07:00

more descriptive page titles 2cee0d7859e16a4f75b632cc9c700eca9c399412 johnmuhl git@johnmuhl.com ec6130f214a7c8983f26f827f38778f50241014d c21582f73984e4bcdd1b9e58696a688a5ad08cac johnmuhl git@johnmuhl.com http://github.com/imajes/radiant/commit/cfc3addb6f7b201bd20f60eb3811cecd05b3429b cfc3addb6f7b201bd20f60eb3811cecd05b3429b

2009-09-21T20:30:18-07:00

Merge branch 'master' of git://github.com/radiant/radiant b02325e2fa490bb8d79007596f784871cfaebf49 johnmuhl git@johnmuhl.com 0753bd99a9650e51c721e9dd4e7bd404c768eba2 Jim Gay jim@saturnflyer.com http://github.com/imajes/radiant/commit/7a943a60df7f7e592ccd90342e9d0f40e52b1d42 7a943a60df7f7e592ccd90342e9d0f40e52b1d42

2009-09-20T12:26:15-07:00

generate names and proper_names for NavSubItems, rearrange arguments for creating new sub items 0d71959122ee96352479e887e815be77dae01231 Jim Gay jim@saturnflyer.com 75e091b39e21cc5b9d183d9fabee0c44b0a44380 Jim Gay jim@saturnflyer.com http://github.com/imajes/radiant/commit/0753bd99a9650e51c721e9dd4e7bd404c768eba2 0753bd99a9650e51c721e9dd4e7bd404c768eba2

2009-09-20T11:08:43-07:00

infer the tab proper name from the name, remove visibility attr_reader c729b6145ea16411b2e7549b3b43512c5a000fcd Jim Gay jim@saturnflyer.com c21582f73984e4bcdd1b9e58696a688a5ad08cac Jim Gay jim@saturnflyer.com http://github.com/imajes/radiant/commit/75e091b39e21cc5b9d183d9fabee0c44b0a44380 75e091b39e21cc5b9d183d9fabee0c44b0a44380

2009-09-20T11:04:35-07:00

control tab visibility based on NavSubItems cf766024eaa753f9aa142c07f570f629602ef703 Jim Gay jim@saturnflyer.com 4e3c2a4eda7d52db0b17099786705cdaae6f2517 Jim Gay jim@saturnflyer.com http://github.com/imajes/radiant/commit/c21582f73984e4bcdd1b9e58696a688a5ad08cac c21582f73984e4bcdd1b9e58696a688a5ad08cac

2009-09-19T20:46:33-07:00

allow non-standard contraller methods for render_region cb6c522a7430fa2c9e17d7ee1da7ba6f697ac43a Jim Gay jim@saturnflyer.com 66c73ddac153ec260b3bab40e435a02566b86587 4e3c2a4eda7d52db0b17099786705cdaae6f2517 johnmuhl git@johnmuhl.com http://github.com/imajes/radiant/commit/ec6130f214a7c8983f26f827f38778f50241014d ec6130f214a7c8983f26f827f38778f50241014d

2009-09-16T21:52:27-07:00

Merge branch 'master' of git://github.com/radiant/radiant 7fbc7a78f568be2f8af17eff970a298555c8132b johnmuhl git@johnmuhl.com 7cffe55526c84462cd6212c3f288fd07b6fb2bf9 John W. Long me@johnwlong.com http://github.com/imajes/radiant/commit/4e3c2a4eda7d52db0b17099786705cdaae6f2517 4e3c2a4eda7d52db0b17099786705cdaae6f2517

2009-09-16T10:28:24-07:00

updated to use Radius 0.6.1 843d8e9cd2797a82a155e46661212af99559eacf John W. Long me@johnwlong.com 88aea98954e40b7e57b062db5cf294d3ad4743ff John W. Long me@johnwlong.com http://github.com/imajes/radiant/commit/7cffe55526c84462cd6212c3f288fd07b6fb2bf9 7cffe55526c84462cd6212c3f288fd07b6fb2bf9

2009-09-16T08:52:48-07:00

use root_path instead of "/" for View Site link 85b0a55042abd72eea9e887ddf1b0755c2635b59 John W. Long me@johnwlong.com fcfec86ae9c9d3b42f1e9b2016458d14c2b33f20 John W. Long me@johnwlong.com http://github.com/imajes/radiant/commit/88aea98954e40b7e57b062db5cf294d3ad4743ff 88aea98954e40b7e57b062db5cf294d3ad4743ff

2009-09-15T15:18:28-07:00

fixed failing tests and bad URL on View Site link a001a9a2800821bcda5cf758f91c4fd3def7eef2 John W. Long me@johnwlong.com 4a89692f3536532c08df492fa4e0c9961678ec04 John W. Long me@johnwlong.com http://github.com/imajes/radiant/commit/fcfec86ae9c9d3b42f1e9b2016458d14c2b33f20 fcfec86ae9c9d3b42f1e9b2016458d14c2b33f20

2009-09-15T15:04:51-07:00

correct typo on content-type and move to more/hide language instead of metadata/hide db1f504a3cdc0953bc7951eee66ed20bf2224881 John W. Long me@johnwlong.com 55606fb23fe7edcd7169731662d5cadd70892dda Sean Cribbs seancribbs@gmail.com http://github.com/imajes/radiant/commit/4a89692f3536532c08df492fa4e0c9961678ec04 4a89692f3536532c08df492fa4e0c9961678ec04

2009-09-15T13:48:38-07:00

Fix size of textarea on part tabs. eaae6e864136e2f69453ee5df6d63e0bbf31296c Sean Cribbs seancribbs@gmail.com 5cf77ee2421e00847eaf9153a8a1b2b3b1a35f5d Sean Cribbs seancribbs@gmail.com http://github.com/imajes/radiant/commit/55606fb23fe7edcd7169731662d5cadd70892dda 55606fb23fe7edcd7169731662d5cadd70892dda

2009-09-15T13:36:49-07:00

Add some helpful shortcut keys. Ctrl-S to "Save and Continue Editing" Ctrl-Shift-S to "Save" (and close) Ctrl-[ to select the previous tab Ctrl-] to select the next tab Ctrl-(1 to 9) to select a tab by number 0c73bea07b520541eb90c81de2c871c6e37b6a0d Sean Cribbs seancribbs@gmail.com 7f54ee507298655f00a791b37363dfd6df9bad95 5cf77ee2421e00847eaf9153a8a1b2b3b1a35f5d johnmuhl git@johnmuhl.com http://github.com/imajes/radiant/commit/66c73ddac153ec260b3bab40e435a02566b86587 66c73ddac153ec260b3bab40e435a02566b86587

2009-09-15T12:54:51-07:00

merge radiant edge 119980b9d65c85bdf278f30a40ea0f710c7e19b8 johnmuhl git@johnmuhl.com 729c7c77c755aa8618a4cad05d9c56ddf314bc9d b807826ba14924bec40c20518c51402b82ff7476 John W. Long me@johnwlong.com http://github.com/imajes/radiant/commit/5cf77ee2421e00847eaf9153a8a1b2b3b1a35f5d 5cf77ee2421e00847eaf9153a8a1b2b3b1a35f5d

2009-09-15T09:10:45-07:00

Merge branch 'blade' of git@github.com:radiant/radiant into blade * 'blade' of git@github.com:radiant/radiant: Cucumber features pass. Fix controller specs. Fix lib and helpers specs. Fix model specs. Don't escape the textarea twice. Upgrade Rails and dataset, move default cache location to tmp/ and release bump. e1fe957b48056239dffebe7b967517da455249d1 John W. Long me@johnwlong.com 13326ead711ca4c3c81a8cd615596bdb5fd98993 Sean Cribbs seancribbs@gmail.com http://github.com/imajes/radiant/commit/b807826ba14924bec40c20518c51402b82ff7476 b807826ba14924bec40c20518c51402b82ff7476

2009-09-15T09:06:44-07:00

Cucumber features pass. 3c5301fa143089cab8382b6eeb17986acbc4b67f Sean Cribbs seancribbs@gmail.com 331aa69572b3c09d43058f6e11a697f15dcaf87e Sean Cribbs seancribbs@gmail.com http://github.com/imajes/radiant/commit/13326ead711ca4c3c81a8cd615596bdb5fd98993 13326ead711ca4c3c81a8cd615596bdb5fd98993

2009-09-15T07:43:08-07:00

Fix controller specs. 85396834336bb01b559379862c8dddd92982d773 Sean Cribbs seancribbs@gmail.com c4d5e86d83d91eb658b1446c74e4339aa4029702 Sean Cribbs seancribbs@gmail.com http://github.com/imajes/radiant/commit/331aa69572b3c09d43058f6e11a697f15dcaf87e 331aa69572b3c09d43058f6e11a697f15dcaf87e

2009-09-15T06:58:56-07:00

Fix lib and helpers specs. f02bc2d38233261bf99a617f75d4a4a47af24961 Sean Cribbs seancribbs@gmail.com e63f766cf3cb578325df725db194959de3a5f7de Sean Cribbs seancribbs@gmail.com http://github.com/imajes/radiant/commit/c4d5e86d83d91eb658b1446c74e4339aa4029702 c4d5e86d83d91eb658b1446c74e4339aa4029702

2009-09-15T06:27:27-07:00

Fix model specs. fa61e94de0e358975350aef22c077b40ebdce6e1 Sean Cribbs seancribbs@gmail.com f4509f5f4b0d9ae8a2e76dcfabe03e7042628826 c9707eebffcdba4c593fc9ec5c6f1bb2f16bed85 Sean Cribbs seancribbs@gmail.com http://github.com/imajes/radiant/commit/e63f766cf3cb578325df725db194959de3a5f7de e63f766cf3cb578325df725db194959de3a5f7de

2009-09-15T06:11:29-07:00

Merge branch 'master' into blade Conflicts: app/views/admin/page_parts/_page_part.html.haml ccef511c1001d38a2c0f71a34853d20fe94a46a3 Sean Cribbs seancribbs@gmail.com f4509f5f4b0d9ae8a2e76dcfabe03e7042628826 John W. Long me@johnwlong.com http://github.com/imajes/radiant/commit/729c7c77c755aa8618a4cad05d9c56ddf314bc9d 729c7c77c755aa8618a4cad05d9c56ddf314bc9d

2009-09-05T09:50:35-07:00

updated tab algorithm for textareas to use soft tabs 3fe599c90205a4bd67fe956dba80c6d8cdbcd7b4 John W. Long me@johnwlong.com 234a33c7592e536431625bcc0e82d939d8fb83cb Sean Cribbs seancribbs@gmail.com http://github.com/imajes/radiant/commit/c9707eebffcdba4c593fc9ec5c6f1bb2f16bed85 c9707eebffcdba4c593fc9ec5c6f1bb2f16bed85

2009-09-05T09:31:44-07:00

2009-09-05T09:29:58-07:00

Don't escape the textarea twice. 119bf6901aec89c734cd655f44578e14d35721d6 Sean Cribbs seancribbs@gmail.com