Created
May 6, 2009 07:14
-
-
Save c3mediagroup/107413 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
385dfe6... HEAD@{0}: reset --hard HEAD@{225} | |
d77cfb8... HEAD@{1}: reset --hard HEAD^ | |
afa2fcb... HEAD@{2}: reset --hard HEAD^ | |
60742f7... HEAD@{3}: reset --hard HEAD^ | |
0372e24... HEAD@{4}: reset --hard HEAD^ | |
219a3ab... HEAD@{5}: reset --hard HEAD^ | |
d028f07... HEAD@{6}: reset --hard HEAD^ | |
3ed5d84... HEAD@{7}: reset --hard HEAD^ | |
14a9401... HEAD@{8}: reset --hard HEAD^ | |
c1f1784... HEAD@{9}: reset --hard HEAD^ | |
e7917c9... HEAD@{10}: reset --hard HEAD^ | |
0556dfc... HEAD@{11}: reset --hard HEAD^ | |
bd2d5dc... HEAD@{12}: reset --hard HEAD^ | |
4e80e68... HEAD@{13}: reset --hard HEAD^ | |
1690c49... HEAD@{14}: reset --hard HEAD^ | |
4f74451... HEAD@{15}: reset --hard HEAD^ | |
3618fa6... HEAD@{16}: reset --hard HEAD^ | |
cfb4bb7... HEAD@{17}: reset --hard HEAD^ | |
923475c... HEAD@{18}: reset --hard HEAD^ | |
c0bf90a... HEAD@{19}: reset --hard HEAD^ | |
2944027... HEAD@{20}: reset --hard HEAD^ | |
f7d58c9... HEAD@{21}: reset HEAD^ | |
b0967b2... HEAD@{22}: checkout: moving from koombea_edge to pacificadvisors | |
289b764... HEAD@{23}: pull : Fast forward | |
89de98d... HEAD@{24}: checkout: moving from edge to koombea_edge | |
89de98d... HEAD@{25}: checkout: moving from koombea_edge to edge | |
89de98d... HEAD@{26}: merge edge: Fast forward | |
15b1463... HEAD@{27}: checkout: moving from edge to koombea_edge | |
89de98d... HEAD@{28}: commit: update urls in sla_temp | |
15b1463... HEAD@{29}: checkout: moving from koombea_edge to edge | |
15b1463... HEAD@{30}: merge edge: Fast forward | |
b0967b2... HEAD@{31}: checkout: moving from edge to koombea_edge | |
15b1463... HEAD@{32}: merge 659625-write-full-sla: Fast forward | |
b0967b2... HEAD@{33}: checkout: moving from 659625-write-full-sla to edge | |
15b1463... HEAD@{34}: commit: added temp sla to docs | |
b0967b2... HEAD@{35}: checkout: moving from edge to 659625-write-full-sla | |
b0967b2... HEAD@{36}: checkout: moving from koombea_edge to edge | |
b0967b2... HEAD@{37}: merge edge: Fast forward | |
c0bf90a... HEAD@{38}: checkout: moving from edge to koombea_edge | |
b0967b2... HEAD@{39}: checkout: moving from pacificadvisors to edge | |
b0967b2... HEAD@{40}: merge edge: Fast forward | |
806e023... HEAD@{41}: pull : Fast forward | |
385dfe6... HEAD@{42}: checkout: moving from production to pacificadvisors | |
b0967b2... HEAD@{43}: merge edge: Fast forward | |
07fdb3f... HEAD@{44}: checkout: moving from staging to production | |
b8e50f5... HEAD@{45}: merge edge: Merge made by recursive. | |
1ef0d3b... HEAD@{46}: checkout: moving from edge to staging | |
b0967b2... HEAD@{47}: merge 657871-cleanup-haml-deprecation-warnings: Fast forward | |
f7d58c9... HEAD@{48}: merge 657838-revise-menu-order: Fast forward | |
2944027... HEAD@{49}: checkout: moving from master to edge | |
013e7b0... HEAD@{50}: commit (merge): merged local master from matt's edge to the origin master | |
b0967b2... HEAD@{51}: merge 657871-cleanup-haml-deprecation-warnings: Fast forward | |
f7d58c9... HEAD@{52}: checkout: moving from 657871-cleanup-haml-deprecation-warnings to master | |
b0967b2... HEAD@{53}: commit: fixed haml quoted strings in roomy.saas | |
f7d58c9... HEAD@{54}: checkout: moving from master to 657871-cleanup-haml-deprecation-warnings | |
f7d58c9... HEAD@{55}: merge 657838-revise-menu-order: Fast forward | |
2944027... HEAD@{56}: checkout: moving from 657838-revise-menu-order to master | |
f7d58c9... HEAD@{57}: commit: revise menu order and shadow. removed staff test | |
2944027... HEAD@{58}: checkout: moving from master to 657838-revise-menu-order | |
2944027... HEAD@{59}: merge edge: Fast forward | |
806e023... HEAD@{60}: checkout: moving from staging to master | |
1ef0d3b... HEAD@{61}: pull : Merge made by recursive. | |
3d11524... HEAD@{62}: merge edge: Merge made by recursive. | |
06cf141... HEAD@{63}: checkout: moving from edge to staging | |
2944027... HEAD@{64}: pull : Fast forward | |
c0bf90a... HEAD@{65}: checkout: moving from koombea_edge to edge | |
c0bf90a... HEAD@{66}: checkout: moving from edge to koombea_edge | |
c0bf90a... HEAD@{67}: checkout: moving from staging to edge | |
06cf141... HEAD@{68}: checkout: moving from master to staging | |
806e023... HEAD@{69}: checkout: moving from edge to master | |
c0bf90a... HEAD@{70}: pull : Fast forward | |
923475c... HEAD@{71}: pull : Fast forward | |
cfb4bb7... HEAD@{72}: pull : Fast forward | |
3618fa6... HEAD@{73}: pull : Fast forward | |
4f74451... HEAD@{74}: checkout: moving from koombea to edge | |
ba060bc... HEAD@{75}: pull : Fast forward | |
be506ec... HEAD@{76}: checkout: moving from staging to koombea | |
06cf141... HEAD@{77}: checkout: moving from edge to staging | |
4f74451... HEAD@{78}: checkout: moving from staging to edge | |
06cf141... HEAD@{79}: merge edge: Merge made by recursive. | |
81eca4f... HEAD@{80}: checkout: moving from edge to staging | |
4f74451... HEAD@{81}: pull : Fast forward | |
1690c49... HEAD@{82}: checkout: moving from 651576-improve-megadropdown-design to edge | |
1690c49... HEAD@{83}: checkout: moving from staging to 651576-improve-megadropdown-design | |
81eca4f... HEAD@{84}: checkout: moving from 651576-improve-megadropdown-design to staging | |
1690c49... HEAD@{85}: merge edge: Fast forward | |
4e80e68... HEAD@{86}: checkout: moving from edge to 651576-improve-megadropdown-design | |
1690c49... HEAD@{87}: checkout: moving from staging to edge | |
81eca4f... HEAD@{88}: pull : Fast forward | |
cbf2bd4... HEAD@{89}: checkout: moving from edge to staging | |
1690c49... HEAD@{90}: pull : Merge made by recursive. | |
4e80e68... HEAD@{91}: merge 651576-improve-megadropdown-design: Fast forward | |
bd2d5dc... HEAD@{92}: checkout: moving from 651576-improve-megadropdown-design to edge | |
4e80e68... HEAD@{93}: commit: menu styling | |
bd2d5dc... HEAD@{94}: merge edge: Fast forward | |
c1f1784... HEAD@{95}: checkout: moving from edge to 651576-improve-megadropdown-design | |
bd2d5dc... HEAD@{96}: pull : Fast forward | |
073d7b1... HEAD@{97}: checkout: moving from upstream to edge | |
5ae7d0a... HEAD@{98}: checkout: moving from edge to upstream | |
073d7b1... HEAD@{99}: checkout: moving from master to edge | |
806e023... HEAD@{100}: checkout: moving from edge to master | |
073d7b1... HEAD@{101}: checkout: moving from 651576-improve-megadropdown-design to edge | |
c1f1784... HEAD@{102}: checkout: moving from edge to 651576-improve-megadropdown-design | |
073d7b1... HEAD@{103}: pull : Merge made by recursive. | |
dcd114e... HEAD@{104}: commit: menu tweaks | |
c1f1784... HEAD@{105}: checkout: moving from 651576-improve-megadropdown-design to edge | |
c1f1784... HEAD@{106}: checkout: moving from edge to 651576-improve-megadropdown-design | |
c1f1784... HEAD@{107}: pull : Fast forward | |
e1b01c5... HEAD@{108}: merge 651039-style-mega-drop-downs: Fast forward | |
3ed5d84... HEAD@{109}: checkout: moving from 651039-style-mega-drop-downs to edge | |
e1b01c5... HEAD@{110}: commit: cleaning up _roomy.sass and making menu links blue | |
0d7c750... HEAD@{111}: commit: extracted menubar css to its own sass file _menubar.sass | |
ba9a4bf... HEAD@{112}: checkout: moving from edge to 651039-style-mega-drop-downs | |
3ed5d84... HEAD@{113}: checkout: moving from koombea to edge | |
be506ec... HEAD@{114}: checkout: moving from staging to koombea | |
cbf2bd4... HEAD@{115}: checkout: moving from koombea to staging | |
be506ec... HEAD@{116}: pull : Fast forward | |
219a3ab... HEAD@{117}: checkout: moving from 651039-style-mega-drop-downs to koombea | |
ba9a4bf... HEAD@{118}: commit: styling work | |
3ed5d84... HEAD@{119}: checkout: moving from edge to 651039-style-mega-drop-downs | |
3ed5d84... HEAD@{120}: commit: bluetrip css archived file | |
d028f07... HEAD@{121}: checkout: moving from staging to edge | |
cbf2bd4... HEAD@{122}: commit (merge): fixed errant semi-colon in bluetrip css font | |
4752b6f... HEAD@{123}: checkout: moving from edge to staging | |
d028f07... HEAD@{124}: commit: fixed errant semi-colon in bluetrip css font | |
219a3ab... HEAD@{125}: checkout: moving from staging to edge | |
4752b6f... HEAD@{126}: checkout: moving from 646424-login-form-styling to staging | |
96abeb6... HEAD@{127}: checkout: moving from edge to 646424-login-form-styling | |
219a3ab... HEAD@{128}: checkout: moving from staging to edge | |
4752b6f... HEAD@{129}: checkout: moving from edge to staging | |
219a3ab... HEAD@{130}: checkout: moving from staging to edge | |
4752b6f... HEAD@{131}: merge edge: Merge made by recursive. | |
02fa27f... HEAD@{132}: checkout: moving from edge to staging | |
219a3ab... HEAD@{133}: checkout: moving from koombea to edge | |
219a3ab... HEAD@{134}: checkout: moving from edge to koombea | |
219a3ab... HEAD@{135}: pull : Merge made by recursive. | |
0372e24... HEAD@{136}: merge 651039-style-mega-drop-downs: Fast forward | |
60742f7... HEAD@{137}: checkout: moving from 651039-style-mega-drop-downs to edge | |
0372e24... HEAD@{138}: commit: styling mega drop downs | |
60742f7... HEAD@{139}: checkout: moving from edge to 651039-style-mega-drop-downs | |
60742f7... HEAD@{140}: merge 651035-cleanup-footer: Fast forward | |
afa2fcb... HEAD@{141}: checkout: moving from 651035-cleanup-footer to edge | |
60742f7... HEAD@{142}: commit: made footer match header. changed link hover color to match max's comps | |
afa2fcb... HEAD@{143}: checkout: moving from edge to 651035-cleanup-footer | |
afa2fcb... HEAD@{144}: checkout: moving from staging to edge | |
02fa27f... HEAD@{145}: pull : Merge made by recursive. | |
ca2559f... HEAD@{146}: merge edge: Merge made by recursive. | |
f568056... HEAD@{147}: checkout: moving from edge to staging | |
afa2fcb... HEAD@{148}: merge 650902-top-header-fixes: Fast forward | |
5f9f86a... HEAD@{149}: checkout: moving from 650902-top-header-fixes to edge | |
afa2fcb... HEAD@{150}: commit: top header fixes | |
d77cfb8... HEAD@{151}: checkout: moving from edge to 650902-top-header-fixes | |
5f9f86a... HEAD@{152}: checkout: moving from master to edge | |
806e023... HEAD@{153}: checkout: moving from _mbMenu to master | |
3ff409b... HEAD@{154}: checkout: moving from x_rfpdf_work to _mbMenu | |
e74553b... HEAD@{155}: checkout: moving from upstream to x_rfpdf_work | |
5ae7d0a... HEAD@{156}: commit (merge): checking on older upstream | |
8a9d3cf... HEAD@{157}: checkout: moving from upstream_rp1 to upstream | |
937e6f3... HEAD@{158}: checkout: moving from 650902-top-header-fixes to upstream_rp1 | |
d77cfb8... HEAD@{159}: commit: more header tweaks | |
3746b97... HEAD@{160}: checkout: moving from upstream to 650902-top-header-fixes | |
8a9d3cf... HEAD@{161}: checkout: moving from 650902-top-header-fixes to upstream | |
3746b97... HEAD@{162}: commit: adding session links back in | |
f8ca03f... HEAD@{163}: checkout: moving from upstream to 650902-top-header-fixes | |
8a9d3cf... HEAD@{164}: checkout: moving from 650902-top-header-fixes to upstream | |
f8ca03f... HEAD@{165}: commit: fixed left side of top header | |
5f9f86a... HEAD@{166}: checkout: moving from edge to 650902-top-header-fixes | |
5f9f86a... HEAD@{167}: pull origin edge: Fast forward | |
806e023... HEAD@{168}: checkout: moving from master to edge | |
806e023... HEAD@{169}: checkout: moving from edge to master | |
cf6da25... HEAD@{170}: checkout: moving from staging to edge | |
f568056... HEAD@{171}: checkout: moving from edge to staging | |
cf6da25... HEAD@{172}: commit (merge): latest from matt | |
1fcbae7... HEAD@{173}: checkout: moving from staging to edge | |
f568056... HEAD@{174}: checkout: moving from upstream to staging | |
8a9d3cf... HEAD@{175}: checkout: moving from staging to upstream | |
f568056... HEAD@{176}: checkout: moving from edge to staging | |
1fcbae7... HEAD@{177}: commit (merge): new local edge branch | |
8a9d3cf... HEAD@{178}: checkout: moving from upstream to edge | |
8a9d3cf... HEAD@{179}: checkout: moving from upstream to upstream | |
8a9d3cf... HEAD@{180}: checkout: moving from staging to upstream | |
f568056... HEAD@{181}: merge 646424-login-form-styling: Merge made by recursive. | |
79a9fc9... HEAD@{182}: checkout: moving from master to staging | |
806e023... HEAD@{183}: checkout: moving from 646424-login-form-styling to master | |
96abeb6... HEAD@{184}: commit: added image submit button to login screen | |
806e023... HEAD@{185}: checkout: moving from master to 646424-login-form-styling | |
806e023... HEAD@{186}: checkout: moving from staging to master | |
79a9fc9... HEAD@{187}: merge _rptesting: Fast forward | |
07fdb3f... HEAD@{188}: checkout: moving from _rptesting to staging | |
79a9fc9... HEAD@{189}: checkout: moving from master to _rptesting | |
806e023... HEAD@{190}: checkout: moving from _rptesting to master | |
79a9fc9... HEAD@{191}: commit: changed login input font | |
806e023... HEAD@{192}: checkout: moving from master to _rptesting | |
806e023... HEAD@{193}: checkout: moving from 646424-login-form-styling to master | |
4efb591... HEAD@{194}: commit: added git workflow doc | |
806e023... HEAD@{195}: checkout: moving from master to 646424-login-form-styling | |
806e023... HEAD@{196}: checkout: moving from upstream to master | |
8a9d3cf... HEAD@{197}: pull : Merge made by recursive. | |
0189def... HEAD@{198}: pull : Merge made by recursive. | |
bf719cd... HEAD@{199}: pull : Merge made by recursive. | |
7782422... HEAD@{200}: pull : Merge made by recursive. | |
64dd77b... HEAD@{201}: checkout: moving from master to upstream | |
806e023... HEAD@{202}: checkout: moving from upstream to master | |
64dd77b... HEAD@{203}: commit: fixing haml conversion | |
b0591d2... HEAD@{204}: pull : Fast forward | |
c1cb57f... HEAD@{205}: commit: fixed most of the haml conversion | |
bcbb771... HEAD@{206}: checkout: moving from master to upstream | |
806e023... HEAD@{207}: checkout: moving from upstream to master | |
bcbb771... HEAD@{208}: commit: fixed haml views--no end tags needed | |
88d6b18... HEAD@{209}: pull : Fast forward | |
8b9a0db... HEAD@{210}: commit: test after-hook email on github | |
a3dbeca... HEAD@{211}: pull : Fast forward | |
937e6f3... HEAD@{212}: checkout: moving from upstream_rp1 to upstream | |
937e6f3... HEAD@{213}: checkout: moving from upstream to upstream_rp1 | |
937e6f3... HEAD@{214}: checkout: moving from master to upstream | |
806e023... HEAD@{215}: checkout: moving from upstream to master | |
937e6f3... HEAD@{216}: pull : Fast forward | |
a843068... HEAD@{217}: pull : Fast forward | |
7d4d5f6... HEAD@{218}: pull : Fast forward | |
c96f079... HEAD@{219}: pull : Fast forward | |
aba2d2e... HEAD@{220}: pull : Fast forward | |
c91823f... HEAD@{221}: pull : Fast forward | |
00ae666... HEAD@{222}: pull : Fast forward | |
646f562... HEAD@{223}: checkout: moving from master to upstream | |
806e023... HEAD@{224}: pull : Fast forward | |
6259a86... HEAD@{225}: pull : Fast forward | |
385dfe6... HEAD@{226}: checkout: moving from pacificadvisors to master | |
385dfe6... HEAD@{227}: checkout: moving from pacificadvisors to pacificadvisors | |
385dfe6... HEAD@{228}: checkout: moving from _SetupStateScreens to pacificadvisors | |
5fccb1b... HEAD@{229}: checkout: moving from pacificadvisors to _SetupStateScreens | |
385dfe6... HEAD@{230}: merge master: Fast forward | |
5fccb1b... HEAD@{231}: checkout: moving from master to pacificadvisors | |
385dfe6... HEAD@{232}: pull : Fast forward | |
5fccb1b... HEAD@{233}: checkout: moving from pacificadvisors to master | |
5fccb1b... HEAD@{234}: checkout: moving from master to pacificadvisors | |
5fccb1b... HEAD@{235}: checkout: moving from wdg to master | |
63bf79d... HEAD@{236}: checkout: moving from _SetupStateScreens to wdg | |
5fccb1b... HEAD@{237}: checkout: moving from master to _SetupStateScreens | |
5fccb1b... HEAD@{238}: checkout: moving from peachtreeplanning to master | |
45b8087... HEAD@{239}: checkout: moving from wdg to peachtreeplanning | |
63bf79d... HEAD@{240}: checkout: moving from peachtreeplanning to wdg | |
45b8087... HEAD@{241}: commit: setup for peachtreeplanning | |
5fccb1b... HEAD@{242}: checkout: moving from master to peachtreeplanning | |
5fccb1b... HEAD@{243}: pull : Fast forward | |
39537f5... HEAD@{244}: pull : Fast forward | |
07fdb3f... HEAD@{245}: checkout: moving from production to master | |
07fdb3f... HEAD@{246}: merge master: Fast forward | |
e049ce6... HEAD@{247}: checkout: moving from staging to production | |
07fdb3f... HEAD@{248}: merge master: Fast forward | |
5c2618e... HEAD@{249}: checkout: moving from master to staging | |
07fdb3f... HEAD@{250}: merge _addCompanySubMenu: Fast forward | |
1c19730... HEAD@{251}: checkout: moving from _addCompanySubMenu to master | |
07fdb3f... HEAD@{252}: commit: removed default param from menuize submenus. broken. | |
1c19730... HEAD@{253}: checkout: moving from master to _addCompanySubMenu | |
1c19730... HEAD@{254}: commit: Removed all Robert Droppings from app. Huzzah. | |
78155d3... HEAD@{255}: pull : Fast forward | |
5c2618e... HEAD@{256}: checkout: moving from staging to master | |
5c2618e... HEAD@{257}: merge master: Fast forward | |
e049ce6... HEAD@{258}: checkout: moving from master to staging | |
5c2618e... HEAD@{259}: merge _advisorView: Fast forward | |
e049ce6... HEAD@{260}: checkout: moving from _advisorView to master | |
5c2618e... HEAD@{261}: commit: table css work & menu changes | |
e049ce6... HEAD@{262}: checkout: moving from master to _advisorView | |
e049ce6... HEAD@{263}: checkout: moving from production to master | |
e049ce6... HEAD@{264}: merge master: Fast forward | |
38e1933... HEAD@{265}: checkout: moving from staging to production | |
e049ce6... HEAD@{266}: merge master: Fast forward | |
1dd6a33... HEAD@{267}: checkout: moving from master to staging | |
e049ce6... HEAD@{268}: commit: fixed clubsum inplace edit dropdown | |
5a1329d... HEAD@{269}: pull : Fast forward | |
1dd6a33... HEAD@{270}: checkout: moving from staging to master | |
1dd6a33... HEAD@{271}: merge master: Fast forward | |
07bea01... HEAD@{272}: checkout: moving from master to staging | |
1dd6a33... HEAD@{273}: pull : Fast forward | |
07bea01... HEAD@{274}: checkout: moving from _customErrorPages to master | |
d2cf0f1... HEAD@{275}: commit: disable local_request.true | |
97da4d5... HEAD@{276}: commit: implement custom error pages | |
07bea01... HEAD@{277}: checkout: moving from master to _customErrorPages | |
07bea01... HEAD@{278}: checkout: moving from staging to master | |
07bea01... HEAD@{279}: merge master: Fast forward | |
38e1933... HEAD@{280}: checkout: moving from master to staging | |
07bea01... HEAD@{281}: pull : Fast forward | |
79c06d0... HEAD@{282}: checkout: moving from wdg to master | |
63bf79d... HEAD@{283}: checkout: moving from master to wdg | |
79c06d0... HEAD@{284}: checkout: moving from wdg to master | |
63bf79d... HEAD@{285}: commit: added wdg logo | |
9bd0040... HEAD@{286}: commit: changed ports | |
7c2d02b... HEAD@{287}: commit: modified db bootstrap | |
80e9cdd... HEAD@{288}: checkout: moving from master to wdg | |
79c06d0... HEAD@{289}: checkout: moving from wdg to master | |
80e9cdd... HEAD@{290}: commit: updating settings for wdg | |
ac9e1f7... HEAD@{291}: commit: changed settings for wealth design group testdeploy | |
79c06d0... HEAD@{292}: checkout: moving from master to wdg | |
79c06d0... HEAD@{293}: pull : Fast forward | |
38e1933... HEAD@{294}: checkout: moving from production to master | |
38e1933... HEAD@{295}: merge master: Fast forward | |
a53d627... HEAD@{296}: checkout: moving from staging to production | |
38e1933... HEAD@{297}: merge master: Fast forward | |
a53d627... HEAD@{298}: checkout: moving from master to staging | |
38e1933... HEAD@{299}: commit: fixed top menu styling | |
d5259f7... HEAD@{300}: checkout: moving from _addjqGrid to master | |
9beaf8e... HEAD@{301}: commit: adding jqGrid test | |
0d7b472... HEAD@{302}: checkout: moving from master to _addjqGrid | |
d5259f7... HEAD@{303}: checkout: moving from _addjqGrid to master | |
0d7b472... HEAD@{304}: merge master: Merge made by recursive. | |
d0e3a9e... HEAD@{305}: checkout: moving from master to _addjqGrid | |
d5259f7... HEAD@{306}: merge staging: Merge made by recursive. | |
3ff409b... HEAD@{307}: checkout: moving from staging to master | |
a53d627... HEAD@{308}: merge production: Fast forward | |
f4aa8cb... HEAD@{309}: checkout: moving from production to staging | |
a53d627... HEAD@{310}: commit: fixed wrong data in col. in advisor clubsumm listing | |
f4aa8cb... HEAD@{311}: checkout: moving from master to production | |
3ff409b... HEAD@{312}: checkout: moving from _addjqGrid to master | |
d0e3a9e... HEAD@{313}: commit: added jqGrid for rails plugin | |
3ff409b... HEAD@{314}: checkout: moving from _mbMenu to _addjqGrid | |
3ff409b... HEAD@{315}: merge master: Fast forward | |
3f842bb... HEAD@{316}: checkout: moving from master to _mbMenu | |
3ff409b... HEAD@{317}: pull : Merge made by recursive. | |
f4aa8cb... HEAD@{318}: checkout: moving from production to master | |
f4aa8cb... HEAD@{319}: merge master: Fast forward | |
cb025e9... HEAD@{320}: checkout: moving from staging to production | |
f4aa8cb... HEAD@{321}: merge master: Fast forward | |
cb025e9... HEAD@{322}: checkout: moving from master to staging | |
f4aa8cb... HEAD@{323}: merge _advisorsearchStyling: Fast forward | |
cb025e9... HEAD@{324}: checkout: moving from _advisorsearchStyling to master | |
f4aa8cb... HEAD@{325}: commit: comment out user.year error | |
cb025e9... HEAD@{326}: merge master: Fast forward | |
9662522... HEAD@{327}: checkout: moving from master to _advisorsearchStyling | |
cb025e9... HEAD@{328}: checkout: moving from production to master | |
cb025e9... HEAD@{329}: merge master: Fast forward | |
d148695... HEAD@{330}: checkout: moving from staging to production | |
cb025e9... HEAD@{331}: merge master: Fast forward | |
d148695... HEAD@{332}: checkout: moving from master to staging | |
cb025e9... HEAD@{333}: commit: advisor search styling | |
d148695... HEAD@{334}: checkout: moving from production to master | |
d148695... HEAD@{335}: merge master: Fast forward | |
7cc7c57... HEAD@{336}: checkout: moving from staging to production | |
d148695... HEAD@{337}: merge master: Fast forward | |
7cc7c57... HEAD@{338}: checkout: moving from master to staging | |
d148695... HEAD@{339}: merge _advisorsearchStyling: Merge made by recursive. | |
7cc7c57... HEAD@{340}: checkout: moving from _advisorsearchStyling to master | |
9662522... HEAD@{341}: checkout: moving from master to _advisorsearchStyling | |
7cc7c57... HEAD@{342}: checkout: moving from production to master | |
7cc7c57... HEAD@{343}: merge master: Fast forward | |
a348082... HEAD@{344}: checkout: moving from staging to production | |
7cc7c57... HEAD@{345}: merge master: Fast forward | |
3f842bb... HEAD@{346}: checkout: moving from master to staging | |
7cc7c57... HEAD@{347}: commit: hooked up clubsumm listing data for contract, etc. | |
66fb8ae... HEAD@{348}: checkout: moving from _advisorsearchStyling to master | |
9662522... HEAD@{349}: commit: changed footer | |
9e31dad... HEAD@{350}: merge master: Merge made by recursive. | |
df41919... HEAD@{351}: checkout: moving from master to _advisorsearchStyling | |
66fb8ae... HEAD@{352}: pull : Fast forward | |
2fbc2ac... HEAD@{353}: checkout: moving from _advisorsearchStyling to master | |
df41919... HEAD@{354}: merge master: Merge made by recursive. | |
7febb06... HEAD@{355}: checkout: moving from master to _advisorsearchStyling | |
2fbc2ac... HEAD@{356}: pull : Fast forward | |
cbc56cd... HEAD@{357}: checkout: moving from _advisorsearchStyling to master | |
7febb06... HEAD@{358}: commit: working on advior search styling | |
cbc56cd... HEAD@{359}: checkout: moving from master to _advisorsearchStyling | |
cbc56cd... HEAD@{360}: pull : Fast forward | |
3f842bb... HEAD@{361}: checkout: moving from staging to master | |
3f842bb... HEAD@{362}: merge master: Fast forward | |
130361e... HEAD@{363}: checkout: moving from master to staging | |
3f842bb... HEAD@{364}: merge _mbMenu: Fast forward | |
e56fc86... HEAD@{365}: checkout: moving from _mbMenu to master | |
3f842bb... HEAD@{366}: commit: more topmenu work | |
4369789... HEAD@{367}: merge master: Merge made by recursive. | |
a1b13b8... HEAD@{368}: checkout: moving from master to _mbMenu | |
e56fc86... HEAD@{369}: pull : Fast forward | |
133f152... HEAD@{370}: checkout: moving from _mbMenu to master | |
a1b13b8... HEAD@{371}: commit: more top menu | |
87396a1... HEAD@{372}: merge master: Merge made by recursive. | |
d6fd4e0... HEAD@{373}: checkout: moving from master to _mbMenu | |
133f152... HEAD@{374}: pull : Fast forward | |
62bf38c... HEAD@{375}: checkout: moving from _mbMenu to master | |
d6fd4e0... HEAD@{376}: commit: more topmenu | |
62bf38c... HEAD@{377}: checkout: moving from master to _mbMenu | |
62bf38c... HEAD@{378}: merge _mbMenu: Fast forward | |
8f63afb... HEAD@{379}: checkout: moving from _mbMenu to master | |
62bf38c... HEAD@{380}: commit: top menu tweaks | |
c4ee653... HEAD@{381}: commit (merge): merged Matt's js changes | |
df310a7... HEAD@{382}: checkout: moving from master to _mbMenu | |
8f63afb... HEAD@{383}: pull : Fast forward | |
8943e73... HEAD@{384}: checkout: moving from _mbMenu to master | |
df310a7... HEAD@{385}: commit: more top menu work | |
8943e73... HEAD@{386}: merge master: Fast forward | |
130361e... HEAD@{387}: checkout: moving from master to _mbMenu | |
8943e73... HEAD@{388}: pull : Fast forward | |
130361e... HEAD@{389}: checkout: moving from staging to master | |
130361e... HEAD@{390}: merge master: Fast forward | |
c501656... HEAD@{391}: checkout: moving from master to staging | |
130361e... HEAD@{392}: merge _mbMenu: Fast forward | |
6792c6d... HEAD@{393}: checkout: moving from _mbMenu to master | |
130361e... HEAD@{394}: commit: top menu work | |
e8ad9bf... HEAD@{395}: merge master: Merge made by recursive. | |
1a36a61... HEAD@{396}: checkout: moving from master to _mbMenu | |
6792c6d... HEAD@{397}: pull : Merge made by recursive. | |
c501656... HEAD@{398}: checkout: moving from _mbMenu to master | |
1a36a61... HEAD@{399}: commit: top menu work | |
c501656... HEAD@{400}: checkout: moving from master to _mbMenu | |
c501656... HEAD@{401}: checkout: moving from _mbMenu to master | |
c501656... HEAD@{402}: merge master: Fast forward | |
bc10f93... HEAD@{403}: checkout: moving from master to _mbMenu | |
c501656... HEAD@{404}: merge staging: Fast forward | |
450bb15... HEAD@{405}: checkout: moving from staging to master | |
c501656... HEAD@{406}: commit: more styling | |
450bb15... HEAD@{407}: merge master: Fast forward | |
b13a94c... HEAD@{408}: checkout: moving from master to staging | |
450bb15... HEAD@{409}: pull : Merge made by recursive. | |
a348082... HEAD@{410}: merge production: Fast forward | |
b13a94c... HEAD@{411}: checkout: moving from production to master | |
a348082... HEAD@{412}: commit: styling accordions | |
b13a94c... HEAD@{413}: merge master: Fast forward | |
8af4db4... HEAD@{414}: checkout: moving from staging to production | |
b13a94c... HEAD@{415}: checkout: moving from master to staging | |
b13a94c... HEAD@{416}: merge staging: Fast forward | |
1cc3883... HEAD@{417}: checkout: moving from staging to master | |
b13a94c... HEAD@{418}: commit: fixed chart colors | |
1cc3883... HEAD@{419}: merge master: Fast forward | |
16696d8... HEAD@{420}: checkout: moving from master to staging | |
1cc3883... HEAD@{421}: pull : Merge made by recursive. | |
16696d8... HEAD@{422}: merge staging: Fast forward | |
bc10f93... HEAD@{423}: checkout: moving from staging to master | |
16696d8... HEAD@{424}: commit: allowed managers to edit user profiles | |
bc10f93... HEAD@{425}: checkout: moving from _mbMenu to staging | |
bc10f93... HEAD@{426}: checkout: moving from master to _mbMenu | |
bc10f93... HEAD@{427}: checkout: moving from staging to master | |
bc10f93... HEAD@{428}: merge master: Fast forward | |
181d6de... HEAD@{429}: checkout: moving from master to staging | |
bc10f93... HEAD@{430}: merge _mbMenu: Fast forward | |
181d6de... HEAD@{431}: checkout: moving from _mbMenu to master | |
bc10f93... HEAD@{432}: commit: added manager access to edit users | |
181d6de... HEAD@{433}: checkout: moving from master to _mbMenu | |
181d6de... HEAD@{434}: checkout: moving from staging to master | |
181d6de... HEAD@{435}: merge master: Fast forward | |
8af4db4... HEAD@{436}: checkout: moving from master to staging | |
181d6de... HEAD@{437}: commit: added hdr logo back in. Tweaking colors. | |
ad8dad9... HEAD@{438}: merge _installZenDesk: Merge made by recursive. | |
6df3fc2... HEAD@{439}: pull : Fast forward | |
ae61aee... HEAD@{440}: checkout: moving from _installZenDesk to master | |
ab8a237... HEAD@{441}: commit: hooked up zendesk support link/overlay | |
ae61aee... HEAD@{442}: checkout: moving from master to _installZenDesk | |
ae61aee... HEAD@{443}: pull : Fast forward | |
8af4db4... HEAD@{444}: checkout: moving from production to master | |
8af4db4... HEAD@{445}: merge master: Fast forward | |
272197f... HEAD@{446}: checkout: moving from staging to production | |
8af4db4... HEAD@{447}: merge master: Fast forward | |
272197f... HEAD@{448}: checkout: moving from to staging | |
f2a518e... HEAD@{449}: checkout: moving to stash | |
272197f... HEAD@{450}: checkout: moving from master to production | |
8af4db4... HEAD@{451}: pull : Fast forward | |
272197f... HEAD@{452}: checkout: moving from _checkPwd to master | |
272197f... HEAD@{453}: checkout: moving from master to _checkPwd | |
272197f... HEAD@{454}: checkout: moving from staging to master | |
272197f... HEAD@{455}: merge master: Fast forward | |
7a57de8... HEAD@{456}: checkout: moving from production to staging | |
272197f... HEAD@{457}: merge master: Fast forward | |
7a57de8... HEAD@{458}: checkout: moving from master to production | |
272197f... HEAD@{459}: pull : Merge made by recursive. | |
496a0d3... HEAD@{460}: merge _fixlegend: Fast forward | |
f59107a... HEAD@{461}: checkout: moving from _fixlegend to master | |
496a0d3... HEAD@{462}: commit: fixed legend on company combined performance | |
f59107a... HEAD@{463}: checkout: moving from master to _fixlegend | |
f59107a... HEAD@{464}: merge _advisorChartUpgrade: Fast forward | |
7a57de8... HEAD@{465}: checkout: moving from _advisorChartUpgrade to master | |
f59107a... HEAD@{466}: commit: start of admin user list back in | |
7a57de8... HEAD@{467}: checkout: moving from master to _advisorChartUpgrade | |
7a57de8... HEAD@{468}: checkout: moving from _fixClubSummAjaxDisplay to master | |
57e3111... HEAD@{469}: checkout: moving from master to _fixClubSummAjaxDisplay | |
7a57de8... HEAD@{470}: checkout: moving from staging to master | |
7a57de8... HEAD@{471}: merge master: Fast forward | |
980627d... HEAD@{472}: checkout: moving from production to staging | |
7a57de8... HEAD@{473}: merge master: Fast forward | |
ac3c061... HEAD@{474}: checkout: moving from master to production | |
7a57de8... HEAD@{475}: merge _advisorChartUpgrade: Fast forward | |
836d421... HEAD@{476}: checkout: moving from _advisorChartUpgrade to master | |
7a57de8... HEAD@{477}: commit: advisor chart tweaking | |
ac3c061... HEAD@{478}: checkout: moving from production to _advisorChartUpgrade | |
ac3c061... HEAD@{479}: commit: working on advisor charts | |
70ed8fc... HEAD@{480}: commit: removed fancy hyperlinks w/ images | |
9b49f86... HEAD@{481}: commit: think I found it | |
60a16fe... HEAD@{482}: commit: more stylesheet fix attempts | |
bd2b2f2... HEAD@{483}: commit: trying to solve stylesheet error. | |
667fa14... HEAD@{484}: commit: turned off remote_cache to see if that's the problem | |
66320a0... HEAD@{485}: commit: trying to fix missing stylesheets on production | |
836d421... HEAD@{486}: merge master: Fast forward | |
c1eb55a... HEAD@{487}: checkout: moving from master to production | |
836d421... HEAD@{488}: pull : Merge made by recursive. | |
57e3111... HEAD@{489}: merge _fixClubSummAjaxDisplay: Fast forward | |
c1eb55a... HEAD@{490}: checkout: moving from _fixClubSummAjaxDisplay to master | |
57e3111... HEAD@{491}: commit: tweaks to styles for IE view of accordions. Switched back to fixe width on the main content panel to solve the issues. | |
c1eb55a... HEAD@{492}: checkout: moving from master to _fixClubSummAjaxDisplay | |
c1eb55a... HEAD@{493}: merge production: Fast forward | |
b71fa79... HEAD@{494}: checkout: moving from production to master | |
c1eb55a... HEAD@{495}: commit: added Dec 2008 GDC raw files | |
b71fa79... HEAD@{496}: merge master: Fast forward | |
9234f4a... HEAD@{497}: checkout: moving from master to production | |
b71fa79... HEAD@{498}: commit: added links to disabled page. Added hoptoad | |
fd7b849... HEAD@{499}: commit: added advisor_safe_name helper | |
d60bb7e... HEAD@{500}: pull : Fast forward | |
ace700a... HEAD@{501}: pull : Fast forward | |
8496305... HEAD@{502}: pull : Fast forward | |
9234f4a... HEAD@{503}: merge production: Fast forward | |
980627d... HEAD@{504}: checkout: moving from production to master | |
9234f4a... HEAD@{505}: commit: added login disabled screen | |
980627d... HEAD@{506}: checkout: moving from staging to production | |
980627d... HEAD@{507}: merge master: Fast forward | |
04df441... HEAD@{508}: checkout: moving from master to staging | |
980627d... HEAD@{509}: merge production: Fast forward | |
c47fcb3... HEAD@{510}: checkout: moving from production to master | |
980627d... HEAD@{511}: commit: EAP YEAR | |
4fbc6aa... HEAD@{512}: commit: eap hard code year | |
c299979... HEAD@{513}: commit: clubsum tab | |
4637cfc... HEAD@{514}: commit: advisors tabs fix | |
6f031be... HEAD@{515}: commit: advisors tabs fixes | |
c47fcb3... HEAD@{516}: merge master: Fast forward | |
299006d... HEAD@{517}: checkout: moving from master to production | |
c47fcb3... HEAD@{518}: merge _DemoClubSummFix: Fast forward | |
02b4f43... HEAD@{519}: checkout: moving from _DemoClubSummFix to master | |
c47fcb3... HEAD@{520}: commit: advisor clubsumm | |
299006d... HEAD@{521}: checkout: moving from production to _DemoClubSummFix | |
299006d... HEAD@{522}: commit: team tweaks | |
02b4f43... HEAD@{523}: merge master: Fast forward | |
b58b881... HEAD@{524}: checkout: moving from master to production | |
02b4f43... HEAD@{525}: pull : Fast forward | |
b58b881... HEAD@{526}: checkout: moving from production to master | |
b58b881... HEAD@{527}: merge master: Fast forward | |
83184a9... HEAD@{528}: checkout: moving from master to production | |
b58b881... HEAD@{529}: pull : Fast forward | |
83184a9... HEAD@{530}: merge production: Fast forward | |
e13f63d... HEAD@{531}: checkout: moving from production to master | |
83184a9... HEAD@{532}: commit: working on units still | |
f1a93d4... HEAD@{533}: commit: trying to fix add members to units | |
e13f63d... HEAD@{534}: merge master: Fast forward | |
2b11b2e... HEAD@{535}: checkout: moving from master to production | |
e13f63d... HEAD@{536}: commit: added premium by unit link | |
2b11b2e... HEAD@{537}: merge production: Fast forward | |
817037b... HEAD@{538}: checkout: moving from production to master | |
2b11b2e... HEAD@{539}: commit: working on teams | |
817037b... HEAD@{540}: merge master: Fast forward | |
04df441... HEAD@{541}: checkout: moving from master to production | |
817037b... HEAD@{542}: merge _DemoFixes: Fast forward | |
04df441... HEAD@{543}: checkout: moving from _DemoFixes to master | |
817037b... HEAD@{544}: commit: working on units | |
04df441... HEAD@{545}: checkout: moving from master to _DemoFixes | |
04df441... HEAD@{546}: checkout: moving from staging to master | |
04df441... HEAD@{547}: merge master: Fast forward | |
c3813f9... HEAD@{548}: checkout: moving from production to staging | |
04df441... HEAD@{549}: merge master: Fast forward | |
d285a3b... HEAD@{550}: checkout: moving from master to production | |
04df441... HEAD@{551}: pull : Merge made by recursive. | |
d285a3b... HEAD@{552}: merge production: Fast forward | |
18c5b40... HEAD@{553}: checkout: moving from production to master | |
d285a3b... HEAD@{554}: commit: removed fancy icon links from bluetrip | |
1197aa2... HEAD@{555}: commit: style work | |
3a96205... HEAD@{556}: commit: fix for I/NP in policy | |
1388b41... HEAD@{557}: commit: I/NP working | |
04ad9df... HEAD@{558}: commit: more fixes for demo | |
99406d2... HEAD@{559}: commit: .gitignore sass generated css files | |
18c5b40... HEAD@{560}: merge master: Fast forward | |
5e3453b... HEAD@{561}: checkout: moving from master to production | |
18c5b40... HEAD@{562}: merge _DemoFix01: Fast forward | |
5e3453b... HEAD@{563}: checkout: moving from _DemoFix01 to master | |
18c5b40... HEAD@{564}: commit: KK Demo fixes | |
5e3453b... HEAD@{565}: checkout: moving from master to _DemoFix01 | |
5e3453b... HEAD@{566}: checkout: moving from production to master | |
5e3453b... HEAD@{567}: merge master: Fast forward | |
ad46ae9... HEAD@{568}: checkout: moving from master to production | |
5e3453b... HEAD@{569}: merge _DemoFix01: Fast forward | |
ad46ae9... HEAD@{570}: checkout: moving from _DemoFix01 to master | |
5e3453b... HEAD@{571}: commit: more table work | |
ad46ae9... HEAD@{572}: checkout: moving from master to _DemoFix01 | |
ad46ae9... HEAD@{573}: merge production: Fast forward | |
b7c5277... HEAD@{574}: checkout: moving from production to master | |
ad46ae9... HEAD@{575}: commit: css & layout fixes for demo | |
b7c5277... HEAD@{576}: merge master: Fast forward | |
c9b8904... HEAD@{577}: checkout: moving from master to production | |
b7c5277... HEAD@{578}: merge _FinalDemoFixes: Fast forward | |
c9b8904... HEAD@{579}: checkout: moving from _FinalDemoFixes to master | |
b7c5277... HEAD@{580}: commit: dashboard fixes | |
c9b8904... HEAD@{581}: checkout: moving from master to _FinalDemoFixes | |
c9b8904... HEAD@{582}: checkout: moving from robert to master | |
c9b8904... HEAD@{583}: merge master: Fast forward | |
93fd91a... HEAD@{584}: checkout: moving from master to robert | |
c9b8904... HEAD@{585}: checkout: moving from production to master | |
c9b8904... HEAD@{586}: merge master: Fast forward | |
4f63e3b... HEAD@{587}: checkout: moving from master to production | |
c9b8904... HEAD@{588}: pull : Merge made by recursive. | |
4f63e3b... HEAD@{589}: merge production: Fast forward | |
566efe6... HEAD@{590}: checkout: moving from production to master | |
4f63e3b... HEAD@{591}: commit: added ziya charts to advisor perf | |
566efe6... HEAD@{592}: merge master: Fast forward | |
056695a... HEAD@{593}: checkout: moving from master to production | |
566efe6... HEAD@{594}: pull : Fast forward | |
056695a... HEAD@{595}: checkout: moving from _fixNotesforRobertMerge to master | |
056695a... HEAD@{596}: checkout: moving from master to _fixNotesforRobertMerge | |
056695a... HEAD@{597}: checkout: moving from production to master | |
056695a... HEAD@{598}: merge master: Fast forward | |
81c8a2c... HEAD@{599}: checkout: moving from master to production | |
056695a... HEAD@{600}: commit (merge): merging robert w/ master | |
7e2cfbb... HEAD@{601}: merge _masterMergewRobert: Fast forward | |
81c8a2c... HEAD@{602}: checkout: moving from _masterMergewRobert to master | |
7e2cfbb... HEAD@{603}: commit (merge): merging master w/ robert | |
81c8a2c... HEAD@{604}: checkout: moving from master to _masterMergewRobert | |
81c8a2c... HEAD@{605}: checkout: moving from _masterBeforeRobert to master | |
e625b4a... HEAD@{606}: commit (merge): merging w/ robert | |
81c8a2c... HEAD@{607}: checkout: moving from master to _masterBeforeRobert | |
81c8a2c... HEAD@{608}: checkout: moving from robert to master | |
93fd91a... HEAD@{609}: checkout: moving from _newUI01 to robert | |
93fd91a... HEAD@{610}: checkout: moving from robert to _newUI01 | |
93fd91a... HEAD@{611}: merge _dashboardWork5: Fast forward | |
c3813f9... HEAD@{612}: checkout: moving from _dashboardWork5 to robert | |
93fd91a... HEAD@{613}: commit: prep for KK's NY presentation | |
c3813f9... HEAD@{614}: checkout: moving from robert to _dashboardWork5 | |
c3813f9... HEAD@{615}: checkout: moving from staging to robert | |
c3813f9... HEAD@{616}: merge robert: Fast forward | |
a7ca6e8... HEAD@{617}: checkout: moving from robert to staging | |
c3813f9... HEAD@{618}: merge _dashboardWork5: Fast forward | |
2d3c502... HEAD@{619}: checkout: moving from _dashboardWork5 to robert | |
c3813f9... HEAD@{620}: commit: more chart work | |
2d3c502... HEAD@{621}: merge robert: Fast forward | |
3a5b7dd... HEAD@{622}: checkout: moving from robert to _dashboardWork5 | |
2d3c502... HEAD@{623}: pull : Fast forward | |
3a5b7dd... HEAD@{624}: checkout: moving from _dashboardWork5 to robert | |
3a5b7dd... HEAD@{625}: checkout: moving from robert to _dashboardWork5 | |
3a5b7dd... HEAD@{626}: merge _dashboardWork5: Fast forward | |
59029fb... HEAD@{627}: checkout: moving from _dashboardWork5 to robert | |
3a5b7dd... HEAD@{628}: commit: just first two metric lines for advisors | |
59029fb... HEAD@{629}: merge robert: Fast forward | |
cb5152c... HEAD@{630}: checkout: moving from robert to _dashboardWork5 | |
59029fb... HEAD@{631}: pull : Fast forward | |
cb5152c... HEAD@{632}: checkout: moving from _dashboardWork5 to robert | |
cb5152c... HEAD@{633}: merge robert: Fast forward | |
487b905... HEAD@{634}: checkout: moving from robert to _dashboardWork5 | |
cb5152c... HEAD@{635}: pull : Fast forward | |
9330b99... HEAD@{636}: pull : Merge made by recursive. | |
487b905... HEAD@{637}: merge _dashboardWork5: Fast forward | |
8280683... HEAD@{638}: checkout: moving from _dashboardWork5 to robert | |
487b905... HEAD@{639}: commit: advisor combined chart data not loading | |
8280683... HEAD@{640}: merge robert: Fast forward | |
a8cd683... HEAD@{641}: checkout: moving from robert to _dashboardWork5 | |
8280683... HEAD@{642}: pull : Fast forward | |
a8cd683... HEAD@{643}: merge _dashboardWork5: Fast forward | |
122125c... HEAD@{644}: checkout: moving from _dashboardWork5 to robert | |
a8cd683... HEAD@{645}: commit: advisor combined chart timing out | |
3563f5f... HEAD@{646}: commit: adding advisor combined chart | |
122125c... HEAD@{647}: checkout: moving from robert to _dashboardWork5 | |
122125c... HEAD@{648}: merge _dashboardWork5: Fast forward | |
2809f30... HEAD@{649}: checkout: moving from _dashboardWork5 to robert | |
122125c... HEAD@{650}: commit: adding metrics to advisor charts | |
2809f30... HEAD@{651}: checkout: moving from robert to _dashboardWork5 | |
2809f30... HEAD@{652}: merge _dashboardWork5: Fast forward | |
e8e0f09... HEAD@{653}: checkout: moving from _dashboardWork5 to robert | |
2809f30... HEAD@{654}: commit: tweaks to the teams chart | |
e8e0f09... HEAD@{655}: checkout: moving from robert to _dashboardWork5 | |
e8e0f09... HEAD@{656}: checkout: moving from _dashboardWork5 to robert | |
e8e0f09... HEAD@{657}: checkout: moving from robert to _dashboardWork5 | |
e8e0f09... HEAD@{658}: pull : Merge made by recursive. | |
d68be40... HEAD@{659}: checkout: moving from production to robert | |
81c8a2c... HEAD@{660}: merge master: Fast forward | |
29bf306... HEAD@{661}: checkout: moving from master to production | |
81c8a2c... HEAD@{662}: merge _fixEAPDetailPage: Fast forward | |
29bf306... HEAD@{663}: checkout: moving from _fixEAPDetailPage to master | |
81c8a2c... HEAD@{664}: commit: brought over EAP detail fix from robert branch | |
29bf306... HEAD@{665}: checkout: moving from robert to _fixEAPDetailPage | |
d68be40... HEAD@{666}: checkout: moving from _fixEAPDetailPage to robert | |
29bf306... HEAD@{667}: checkout: moving from master to _fixEAPDetailPage | |
29bf306... HEAD@{668}: checkout: moving from robert to master | |
d68be40... HEAD@{669}: commit: robert's work. interim | |
92351f5... HEAD@{670}: pull : Fast forward | |
fbafc7d... HEAD@{671}: pull : Fast forward | |
c7e3720... HEAD@{672}: merge staging: Merge made by recursive. | |
fcf1a1a... HEAD@{673}: checkout: moving from staging to robert | |
a7ca6e8... HEAD@{674}: commit: company chart on dashboard | |
6c36c33... HEAD@{675}: checkout: moving from robert to staging | |
fcf1a1a... HEAD@{676}: pull : Merge made by recursive. | |
6c36c33... HEAD@{677}: merge staging: Fast forward | |
962999c... HEAD@{678}: checkout: moving from staging to robert | |
6c36c33... HEAD@{679}: commit: crafting company run rate charts | |
962999c... HEAD@{680}: merge robert: Fast forward | |
9378a5b... HEAD@{681}: checkout: moving from robert to staging | |
962999c... HEAD@{682}: commit: more chart tweaking | |
6971157... HEAD@{683}: pull : Fast forward | |
2c7f608... HEAD@{684}: commit: further work on chart styles | |
e3a7a06... HEAD@{685}: checkout: moving from master to robert | |
29bf306... HEAD@{686}: merge production: Fast forward | |
de679c7... HEAD@{687}: checkout: moving from production to master | |
29bf306... HEAD@{688}: commit: hardcoded 2008 into EAP temporarily | |
de679c7... HEAD@{689}: merge master: Fast forward | |
8323401... HEAD@{690}: checkout: moving from master to production | |
de679c7... HEAD@{691}: pull : Fast forward | |
8323401... HEAD@{692}: checkout: moving from robert to master | |
e3a7a06... HEAD@{693}: commit: further company run_rate styling | |
2761ad6... HEAD@{694}: pull : Merge made by recursive. | |
b59c18f... HEAD@{695}: commit: robert's run rate chart styling | |
a85d019... HEAD@{696}: pull : Fast forward | |
8053a14... HEAD@{697}: pull : Fast forward | |
6396e26... HEAD@{698}: pull : Fast forward | |
83cfd61... HEAD@{699}: pull : Fast forward | |
9378a5b... HEAD@{700}: checkout: moving from _dashboardWork4 to robert | |
9378a5b... HEAD@{701}: checkout: moving from production to _dashboardWork4 | |
8323401... HEAD@{702}: checkout: moving from _dashboardWork4 to production | |
9378a5b... HEAD@{703}: checkout: moving from production to _dashboardWork4 | |
8323401... HEAD@{704}: merge master: Fast forward | |
b417454... HEAD@{705}: checkout: moving from master to production | |
8323401... HEAD@{706}: pull : Fast forward | |
b417454... HEAD@{707}: checkout: moving from staging to master | |
9378a5b... HEAD@{708}: merge robert: Fast forward | |
dcd6479... HEAD@{709}: checkout: moving from robert to staging | |
9378a5b... HEAD@{710}: merge _dashboardWork4: Fast forward | |
6a8f683... HEAD@{711}: checkout: moving from _dashboardWork4 to robert | |
9378a5b... HEAD@{712}: commit: dashboard tweaks for Matt | |
6eadef7... HEAD@{713}: merge robert: Merge made by recursive. | |
280d02c... HEAD@{714}: checkout: moving from robert to _dashboardWork4 | |
6a8f683... HEAD@{715}: pull : Fast forward | |
dcd6479... HEAD@{716}: checkout: moving from _dashboardWork4 to robert | |
280d02c... HEAD@{717}: checkout: moving from production to _dashboardWork4 | |
b417454... HEAD@{718}: merge master: Fast forward | |
6cea5ba... HEAD@{719}: checkout: moving from master to production | |
b417454... HEAD@{720}: merge _updateClubSumFixforProduction: Fast forward | |
6cea5ba... HEAD@{721}: checkout: moving from _updateClubSumFixforProduction to master | |
b417454... HEAD@{722}: commit: fixed clubsumm errro due to advisor.guardian_name | |
6cea5ba... HEAD@{723}: checkout: moving from master to _updateClubSumFixforProduction | |
6cea5ba... HEAD@{724}: checkout: moving from _dashboardWork4 to master | |
280d02c... HEAD@{725}: commit: fixed head nav tabs div | |
dcd6479... HEAD@{726}: checkout: moving from robert to _dashboardWork4 | |
dcd6479... HEAD@{727}: checkout: moving from staging to robert | |
dcd6479... HEAD@{728}: merge robert: Fast forward | |
5a9b0ec... HEAD@{729}: checkout: moving from robert to staging | |
dcd6479... HEAD@{730}: commit (merge): fixed merge conflicts w/ Matt's | |
5dfe66f... HEAD@{731}: pull : Fast forward | |
5a9b0ec... HEAD@{732}: checkout: moving from _dashboardWork3 to robert | |
7e8ac7c... HEAD@{733}: commit: added back in head tabs nav | |
5a9b0ec... HEAD@{734}: checkout: moving from robert to _dashboardWork3 | |
5a9b0ec... HEAD@{735}: checkout: moving from staging to robert | |
5a9b0ec... HEAD@{736}: merge robert: Fast forward | |
c8e1e3f... HEAD@{737}: checkout: moving from robert to staging | |
5a9b0ec... HEAD@{738}: commit (merge): conflict w/robert origin resolved in _head.html.haml | |
c8e1e3f... HEAD@{739}: merge staging: Fast forward | |
d6c045f... HEAD@{740}: checkout: moving from staging to robert | |
c8e1e3f... HEAD@{741}: merge _dashboardWork2: Fast forward | |
f2151c6... HEAD@{742}: checkout: moving from _dashboardWork2 to staging | |
c8e1e3f... HEAD@{743}: commit: new layout, header, footer, side & css work | |
f2151c6... HEAD@{744}: merge staging: Fast forward | |
dc794b1... HEAD@{745}: checkout: moving from staging to _dashboardWork2 | |
f2151c6... HEAD@{746}: commit: disabled capgun in staging deploy also | |
dc794b1... HEAD@{747}: merge _dashboardWork2: Fast forward | |
6cea5ba... HEAD@{748}: checkout: moving from _dashboardWork2 to staging | |
dc794b1... HEAD@{749}: merge master: Merge made by recursive. | |
a2c4a7b... HEAD@{750}: checkout: moving from staging to _dashboardWork2 | |
6cea5ba... HEAD@{751}: merge master: Fast forward | |
9dc3ee7... HEAD@{752}: checkout: moving from production to staging | |
6cea5ba... HEAD@{753}: merge master: Fast forward | |
22f0463... HEAD@{754}: checkout: moving from master to production | |
6cea5ba... HEAD@{755}: pull : Fast forward | |
22f0463... HEAD@{756}: checkout: moving from production to master | |
22f0463... HEAD@{757}: merge master: Fast forward | |
8b5f19c... HEAD@{758}: checkout: moving from master to production | |
22f0463... HEAD@{759}: commit: disable capgun notifications to try and solve production deploy timeout | |
8b5f19c... HEAD@{760}: checkout: moving from production to master | |
8b5f19c... HEAD@{761}: merge master: Fast forward | |
064646b... HEAD@{762}: checkout: moving from master to production | |
8b5f19c... HEAD@{763}: pull : Fast forward | |
3784dc1... HEAD@{764}: checkout: moving from _dashboardWork2 to master | |
a2c4a7b... HEAD@{765}: commit: added uservoice feedback link | |
2b82016... HEAD@{766}: checkout: moving from master to _dashboardWork2 | |
3784dc1... HEAD@{767}: pull : Fast forward | |
2f28743... HEAD@{768}: checkout: moving from _dashboardWork2 to master | |
2b82016... HEAD@{769}: commit: tweaks to menu | |
d9e502f... HEAD@{770}: merge master: Merge made by recursive. | |
d6c045f... HEAD@{771}: checkout: moving from robert to _dashboardWork2 | |
d6c045f... HEAD@{772}: checkout: moving from master to robert | |
2f28743... HEAD@{773}: pull : Fast forward | |
1b35f05... HEAD@{774}: checkout: moving from robert to master | |
d6c045f... HEAD@{775}: commit: fleshing out new ui | |
3a57c08... HEAD@{776}: merge _dashboardWork: Fast forward | |
67be754... HEAD@{777}: checkout: moving from _dashboardWork to robert | |
3a57c08... HEAD@{778}: commit: adding accordions galore | |
67be754... HEAD@{779}: checkout: moving from robert to _dashboardWork | |
67be754... HEAD@{780}: pull : Fast forward | |
86a9ce9... HEAD@{781}: checkout: moving from _FramedLayout to robert | |
86a9ce9... HEAD@{782}: merge robert: Fast forward | |
0277b1f... HEAD@{783}: checkout: moving from robert to _FramedLayout | |
86a9ce9... HEAD@{784}: pull : Fast forward | |
0277b1f... HEAD@{785}: checkout: moving from _FramedLayout to robert | |
0277b1f... HEAD@{786}: checkout: moving from robert to _FramedLayout | |
0277b1f... HEAD@{787}: merge _FramedLayout: Fast forward | |
b569b2c... HEAD@{788}: checkout: moving from _FramedLayout to robert | |
0277b1f... HEAD@{789}: commit: styling ui.accordion in side menu. more work on new ui | |
b569b2c... HEAD@{790}: merge robert: Fast forward | |
0f64cfd... HEAD@{791}: checkout: moving from robert to _FramedLayout | |
b569b2c... HEAD@{792}: pull : Fast forward | |
0f64cfd... HEAD@{793}: checkout: moving from _FramedLayout to robert | |
0f64cfd... HEAD@{794}: checkout: moving from Robert to _FramedLayout | |
0f64cfd... HEAD@{795}: checkout: moving from _FramedLayout to Robert | |
0f64cfd... HEAD@{796}: commit: sidemenu in progress | |
a342709... HEAD@{797}: checkout: moving from designer to _FramedLayout | |
36a9eb8... HEAD@{798}: checkout: moving from _FramedLayout to designer | |
a342709... HEAD@{799}: commit: implemented 'framed' layout and new header. Started on side menu system | |
1b35f05... HEAD@{800}: checkout: moving from master to _FramedLayout | |
1b35f05... HEAD@{801}: checkout: moving from _sassIntegration to master | |
1b35f05... HEAD@{802}: checkout: moving from master to _sassIntegration | |
1b35f05... HEAD@{803}: checkout: moving from _sassIntegration to master | |
1b35f05... HEAD@{804}: checkout: moving from staging to _sassIntegration | |
9dc3ee7... HEAD@{805}: checkout: moving from master to staging | |
1b35f05... HEAD@{806}: checkout: moving from _sassIntegration to master | |
1b35f05... HEAD@{807}: checkout: moving from master to _sassIntegration | |
1b35f05... HEAD@{808}: pull : Fast forward | |
064646b... HEAD@{809}: checkout: moving from production to master | |
064646b... HEAD@{810}: merge master: Fast forward | |
d9c94fe... HEAD@{811}: pull : Fast forward | |
9dc3ee7... HEAD@{812}: checkout: moving from master to production | |
064646b... HEAD@{813}: pull : Merge made by recursive. | |
598999d... HEAD@{814}: merge _addExectoSetup: Fast forward | |
9dc3ee7... HEAD@{815}: checkout: moving from _addExectoSetup to master | |
598999d... HEAD@{816}: commit: fix manager access to advisor setup. Not test covered yet. | |
9dc3ee7... HEAD@{817}: checkout: moving from master to _addExectoSetup | |
9dc3ee7... HEAD@{818}: checkout: moving from production to master | |
9dc3ee7... HEAD@{819}: merge master: Fast forward | |
b5e8a5e... HEAD@{820}: pull : Fast forward | |
77e9365... HEAD@{821}: checkout: moving from staging to production | |
9dc3ee7... HEAD@{822}: merge master: Fast forward | |
b5e8a5e... HEAD@{823}: pull : Fast forward | |
77e9365... HEAD@{824}: checkout: moving from master to staging | |
9dc3ee7... HEAD@{825}: merge _yearSelFix: Fast forward | |
b5e8a5e... HEAD@{826}: checkout: moving from _yearSelFix to master | |
9dc3ee7... HEAD@{827}: commit: cleaned up year selector display | |
b5e8a5e... HEAD@{828}: checkout: moving from master to _yearSelFix | |
b5e8a5e... HEAD@{829}: pull : Fast forward | |
77e9365... HEAD@{830}: checkout: moving from _yearSelFix to master | |
77e9365... HEAD@{831}: checkout: moving from master to _yearSelFix | |
77e9365... HEAD@{832}: checkout: moving from _changeMgrDefault to master | |
77e9365... HEAD@{833}: checkout: moving from master to _changeMgrDefault | |
77e9365... HEAD@{834}: checkout: moving from staging to master | |
77e9365... HEAD@{835}: checkout: moving from production to staging | |
77e9365... HEAD@{836}: merge master: Fast forward | |
1a9cfb9... HEAD@{837}: checkout: moving from staging to production | |
77e9365... HEAD@{838}: merge master: Fast forward | |
4374d5f... HEAD@{839}: checkout: moving from master to staging | |
77e9365... HEAD@{840}: pull : Fast forward | |
1a9cfb9... HEAD@{841}: checkout: moving from production to master | |
1a9cfb9... HEAD@{842}: merge master: Fast forward | |
0ca1526... HEAD@{843}: checkout: moving from master to production | |
1a9cfb9... HEAD@{844}: checkout: moving from staging to master | |
4374d5f... HEAD@{845}: checkout: moving from master to staging | |
1a9cfb9... HEAD@{846}: merge _advisorExperience: Fast forward | |
4b75d33... HEAD@{847}: checkout: moving from _advisorExperience to master | |
1a9cfb9... HEAD@{848}: commit: sr logo tagline changes & css fixes | |
5314e2c... HEAD@{849}: merge master: Merge made by recursive. | |
62b2453... HEAD@{850}: checkout: moving from _fixPolicyNotesMenu to _advisorExperience | |
4b75d33... HEAD@{851}: checkout: moving from master to _fixPolicyNotesMenu | |
4b75d33... HEAD@{852}: pull : Fast forward | |
b10df9c... HEAD@{853}: checkout: moving from _advisorExperience to master | |
62b2453... HEAD@{854}: merge master: Merge made by recursive. | |
c320aa6... HEAD@{855}: checkout: moving from master to _advisorExperience | |
b10df9c... HEAD@{856}: pull : Fast forward | |
ff65710... HEAD@{857}: checkout: moving from _advisorExperience to master | |
c320aa6... HEAD@{858}: commit: update logo & footer css | |
ff65710... HEAD@{859}: checkout: moving from master to _advisorExperience | |
ff65710... HEAD@{860}: pull : Fast forward | |
4374d5f... HEAD@{861}: checkout: moving from circar to master | |
a360816... HEAD@{862}: pull : Fast forward | |
bfd9085... HEAD@{863}: checkout: moving from _updatesToMattsEAP to circar | |
4374d5f... HEAD@{864}: checkout: moving from master to _updatesToMattsEAP | |
4374d5f... HEAD@{865}: checkout: moving from staging to master | |
4374d5f... HEAD@{866}: merge master: Fast forward | |
ec3a133... HEAD@{867}: checkout: moving from master to staging | |
4374d5f... HEAD@{868}: pull : Fast forward | |
0ca1526... HEAD@{869}: checkout: moving from production to master | |
0ca1526... HEAD@{870}: merge master: Fast forward | |
ec3a133... HEAD@{871}: checkout: moving from master to production | |
0ca1526... HEAD@{872}: pull : Merge made by recursive. | |
4f021ff... HEAD@{873}: merge _PaulViewFixes: Fast forward | |
ec3a133... HEAD@{874}: checkout: moving from _PaulViewFixes to master | |
4f021ff... HEAD@{875}: commit: fixed perf chart legend width issues | |
ec3a133... HEAD@{876}: checkout: moving from master to _PaulViewFixes | |
ec3a133... HEAD@{877}: checkout: moving from staging to master | |
ec3a133... HEAD@{878}: merge master: Fast forward | |
e6e10db... HEAD@{879}: checkout: moving from production to staging | |
ec3a133... HEAD@{880}: pull : Fast forward | |
e6e10db... HEAD@{881}: checkout: moving from master to production | |
ec3a133... HEAD@{882}: pull : Fast forward | |
8568920... HEAD@{883}: pull : Merge made by recursive. | |
e6e10db... HEAD@{884}: checkout: moving from production to master | |
e6e10db... HEAD@{885}: merge master: Fast forward | |
52bc31d... HEAD@{886}: checkout: moving from staging to production | |
e6e10db... HEAD@{887}: merge master: Fast forward | |
52bc31d... HEAD@{888}: checkout: moving from master to staging | |
e6e10db... HEAD@{889}: merge _Jan01Fixes: Fast forward | |
52bc31d... HEAD@{890}: checkout: moving from _Jan01Fixes to master | |
e6e10db... HEAD@{891}: commit: Robert's temp fixes for New Year charting failure - No Data | |
52bc31d... HEAD@{892}: checkout: moving from master to _Jan01Fixes | |
52bc31d... HEAD@{893}: checkout: moving from production to master | |
52bc31d... HEAD@{894}: checkout: moving from staging to production | |
52bc31d... HEAD@{895}: merge master: Fast forward | |
67460b0... HEAD@{896}: checkout: moving from master to staging | |
52bc31d... HEAD@{897}: checkout: moving from production to master | |
52bc31d... HEAD@{898}: merge master: Fast forward | |
f3bc676... HEAD@{899}: checkout: moving from master to production | |
52bc31d... HEAD@{900}: checkout: moving from _Dec31Fixes to master | |
52bc31d... HEAD@{901}: checkout: moving from master to _Dec31Fixes | |
52bc31d... HEAD@{902}: pull : Fast forward | |
67460b0... HEAD@{903}: checkout: moving from staging to master | |
67460b0... HEAD@{904}: merge master: Fast forward | |
f3bc676... HEAD@{905}: checkout: moving from master to staging | |
67460b0... HEAD@{906}: pull : Fast forward | |
f3bc676... HEAD@{907}: checkout: moving from staging to master | |
f3bc676... HEAD@{908}: merge master: Fast forward | |
fc23e48... HEAD@{909}: checkout: moving from production to staging | |
f3bc676... HEAD@{910}: merge master: Fast forward | |
fc23e48... HEAD@{911}: checkout: moving from master to production | |
f3bc676... HEAD@{912}: pull : Fast forward | |
5e8b8cb... HEAD@{913}: checkout: moving from _JaimeEAP to master | |
5e8b8cb... HEAD@{914}: checkout: moving from master to _JaimeEAP | |
5e8b8cb... HEAD@{915}: pull : Fast forward | |
fc23e48... HEAD@{916}: checkout: moving from circar to master | |
bfd9085... HEAD@{917}: pull : Fast forward | |
aa11aa5... HEAD@{918}: checkout: moving from _circar_views to circar | |
aa11aa5... HEAD@{919}: checkout: moving from circar to _circar_views | |
aa11aa5... HEAD@{920}: commit (merge): Remerged circar account.rb additions to master account.rb | |
8145468... HEAD@{921}: checkout: moving from master to circar | |
fc23e48... HEAD@{922}: checkout: moving from circar to master | |
8145468... HEAD@{923}: merge _circar_view_work: Fast forward | |
d593bbb... HEAD@{924}: checkout: moving from _circar_view_work to circar | |
8145468... HEAD@{925}: commit: looking at circar integration | |
17f9029... HEAD@{926}: commit (merge): merging master into latest circar | |
a71f892... HEAD@{927}: commit: prep to merge master into circar | |
d593bbb... HEAD@{928}: checkout: moving from circar to _circar_view_work | |
d593bbb... HEAD@{929}: pull : Merge made by recursive. | |
cfa4a87... HEAD@{930}: checkout: moving from master to circar | |
fc23e48... HEAD@{931}: checkout: moving from production to master | |
fc23e48... HEAD@{932}: merge master: Fast forward | |
3ddcf36... HEAD@{933}: checkout: moving from master to production | |
fc23e48... HEAD@{934}: checkout: moving from staging to master | |
fc23e48... HEAD@{935}: checkout: moving from master to staging | |
fc23e48... HEAD@{936}: merge staging: Fast forward | |
ca08848... HEAD@{937}: checkout: moving from staging to master | |
fc23e48... HEAD@{938}: commit: why the heck doesn't db/schema.rb commit? | |
0535f57... HEAD@{939}: commit: cleaned up hdr logo and added environment tag to header | |
ca08848... HEAD@{940}: merge master: Fast forward | |
ccc458d... HEAD@{941}: checkout: moving from master to staging | |
ca08848... HEAD@{942}: checkout: moving from _bug_disappearingTeamMembers to master | |
ca08848... HEAD@{943}: checkout: moving from master to _bug_disappearingTeamMembers | |
ca08848... HEAD@{944}: pull : Fast forward | |
3ddcf36... HEAD@{945}: checkout: moving from circar to master | |
cfa4a87... HEAD@{946}: commit: added EAP to .gitignore | |
2f694f8... HEAD@{947}: pull : Fast forward | |
9660f43... HEAD@{948}: checkout: moving from master to circar | |
3ddcf36... HEAD@{949}: checkout: moving from circar to master | |
3ddcf36... HEAD@{950}: checkout: moving from master to circar | |
3ddcf36... HEAD@{951}: checkout: moving from circar to master | |
3ddcf36... HEAD@{952}: checkout: moving from master to circar | |
3ddcf36... HEAD@{953}: checkout: moving from circar to master | |
76a913f... HEAD@{954}: checkout: moving from master to circar | |
3ddcf36... HEAD@{955}: checkout: moving from circar to master | |
3ddcf36... HEAD@{956}: checkout: moving from master to circar | |
3ddcf36... HEAD@{957}: checkout: moving from circar to master | |
76a913f... HEAD@{958}: checkout: moving from master to circar | |
3ddcf36... HEAD@{959}: checkout: moving from circar to master | |
76a913f... HEAD@{960}: checkout: moving from master to circar | |
3ddcf36... HEAD@{961}: checkout: moving from _clubsummViews to master | |
3ddcf36... HEAD@{962}: checkout: moving from master to _clubsummViews | |
3ddcf36... HEAD@{963}: checkout: moving from production to master | |
3ddcf36... HEAD@{964}: checkout: moving from _clubsummViews to production | |
3ddcf36... HEAD@{965}: checkout: moving from master to _clubsummViews | |
3ddcf36... HEAD@{966}: checkout: moving from production to master | |
3ddcf36... HEAD@{967}: merge master: Fast forward | |
a8f1854... HEAD@{968}: checkout: moving from master to production | |
3ddcf36... HEAD@{969}: pull : Fast forward | |
4d7d57b... HEAD@{970}: checkout: moving from circar to master | |
76a913f... HEAD@{971}: checkout: moving from _AdvisorPolicyList to circar | |
2346f17... HEAD@{972}: commit: working on advisor policies view | |
4d7d57b... HEAD@{973}: checkout: moving from master to _AdvisorPolicyList | |
4d7d57b... HEAD@{974}: pull : Fast forward | |
a8f1854... HEAD@{975}: checkout: moving from _addPolicyListTotal to master | |
a8f1854... HEAD@{976}: checkout: moving from master to _addPolicyListTotal | |
a8f1854... HEAD@{977}: checkout: moving from production to master | |
a8f1854... HEAD@{978}: merge master: Fast forward | |
909987f... HEAD@{979}: checkout: moving from master to production | |
a8f1854... HEAD@{980}: pull : Fast forward | |
909987f... HEAD@{981}: checkout: moving from production to master | |
909987f... HEAD@{982}: merge master: Fast forward | |
ccc458d... HEAD@{983}: checkout: moving from master to production | |
909987f... HEAD@{984}: pull : Fast forward | |
ccc458d... HEAD@{985}: checkout: moving from circar to master | |
76a913f... HEAD@{986}: checkout: moving from master to circar | |
ccc458d... HEAD@{987}: checkout: moving from circar to master | |
ccc458d... HEAD@{988}: checkout: moving from staging to circar | |
ccc458d... HEAD@{989}: checkout: moving from circar to staging | |
76a913f... HEAD@{990}: pull : Fast forward | |
ddcb46e... HEAD@{991}: checkout: moving from production to circar | |
ccc458d... HEAD@{992}: merge master: Fast forward | |
5cb7948... HEAD@{993}: checkout: moving from staging to production | |
ccc458d... HEAD@{994}: checkout: moving from master to staging | |
ccc458d... HEAD@{995}: merge staging: Fast forward | |
f74f188... HEAD@{996}: checkout: moving from staging to master | |
ccc458d... HEAD@{997}: commit: more policy views work. Modified policy.totals to fix decimal truncating during the data onvert | |
f74f188... HEAD@{998}: merge master: Fast forward | |
e58ab0e... HEAD@{999}: checkout: moving from master to staging | |
f74f188... HEAD@{1000}: commit: split out policy searches - need to optimize to minimize page load time | |
e58ab0e... HEAD@{1001}: checkout: moving from staging to master | |
e58ab0e... HEAD@{1002}: merge master: Fast forward | |
54c4b1d... HEAD@{1003}: checkout: moving from master to staging | |
e58ab0e... HEAD@{1004}: checkout: moving from circar to master | |
ddcb46e... HEAD@{1005}: commit (merge): merging conflicts w/ circar | |
e58ab0e... HEAD@{1006}: checkout: moving from master to circar | |
e58ab0e... HEAD@{1007}: checkout: moving from circar to master | |
20f1642... HEAD@{1008}: commit (merge): merge conflicts in circar branch | |
d113bcf... HEAD@{1009}: checkout: moving from master to circar | |
e58ab0e... HEAD@{1010}: merge _updateTableCss: Fast forward | |
5cb7948... HEAD@{1011}: checkout: moving from _updateTableCss to master | |
e58ab0e... HEAD@{1012}: commit: additional view work on policies | |
70263ed... HEAD@{1013}: commit: updated policy views css & functionality | |
7c1354a... HEAD@{1014}: commit: reverted nav_tabs method to restore app tab highighting functionality. Moved special case method for policies into policies_helper.rb | |
5cb7948... HEAD@{1015}: checkout: moving from master to _updateTableCss | |
5cb7948... HEAD@{1016}: checkout: moving from circar to master | |
d113bcf... HEAD@{1017}: checkout: moving from production to circar | |
5cb7948... HEAD@{1018}: merge master: Fast forward | |
5475da9... HEAD@{1019}: checkout: moving from master to production | |
5cb7948... HEAD@{1020}: pull : Fast forward | |
8b8199f... HEAD@{1021}: checkout: moving from circar to master | |
d113bcf... HEAD@{1022}: pull : Fast forward | |
5475da9... HEAD@{1023}: checkout: moving from master to circar | |
8b8199f... HEAD@{1024}: pull : Fast forward | |
5475da9... HEAD@{1025}: checkout: moving from circar to master | |
5475da9... HEAD@{1026}: checkout: moving from master to circar | |
5475da9... HEAD@{1027}: checkout: moving from _20081210Fixes to master | |
546c486... HEAD@{1028}: commit: fixed sr hdr logo overlap and xhtml validation of sessions views | |
5475da9... HEAD@{1029}: checkout: moving from master to _20081210Fixes | |
5475da9... HEAD@{1030}: checkout: moving from production to master | |
5475da9... HEAD@{1031}: merge master: Fast forward | |
da6ef4c... HEAD@{1032}: checkout: moving from master to production | |
5475da9... HEAD@{1033}: pull : Fast forward | |
da6ef4c... HEAD@{1034}: checkout: moving from production to master | |
da6ef4c... HEAD@{1035}: merge master: Fast forward | |
eb59acc... HEAD@{1036}: checkout: moving from master to production | |
da6ef4c... HEAD@{1037}: pull : Fast forward | |
eb59acc... HEAD@{1038}: checkout: moving from production to master | |
eb59acc... HEAD@{1039}: merge master: Fast forward | |
54c4b1d... HEAD@{1040}: checkout: moving from master to production | |
eb59acc... HEAD@{1041}: merge _demoFixes: Merge made by recursive. | |
0a95e05... HEAD@{1042}: pull : Fast forward | |
54c4b1d... HEAD@{1043}: checkout: moving from _demoFixes to master | |
5b5da44... HEAD@{1044}: commit: changed sr logos to jpg for backward compatibility | |
54c4b1d... HEAD@{1045}: checkout: moving from master to _demoFixes | |
54c4b1d... HEAD@{1046}: checkout: moving from production to master | |
54c4b1d... HEAD@{1047}: merge master: Fast forward | |
b8b0708... HEAD@{1048}: checkout: moving from master to production | |
54c4b1d... HEAD@{1049}: checkout: moving from production to master | |
b8b0708... HEAD@{1050}: checkout: moving from staging to production | |
54c4b1d... HEAD@{1051}: merge master: Fast forward | |
9fabf60... HEAD@{1052}: checkout: moving from master to staging | |
54c4b1d... HEAD@{1053}: pull : Fast forward | |
37e1542... HEAD@{1054}: pull : Fast forward | |
b8b0708... HEAD@{1055}: checkout: moving from production to master | |
b8b0708... HEAD@{1056}: merge master: Fast forward | |
9fabf60... HEAD@{1057}: checkout: moving from master to production | |
b8b0708... HEAD@{1058}: merge _AddByAdvisortoPremium: Fast forward | |
9fabf60... HEAD@{1059}: checkout: moving from _AddByAdvisortoPremium to master | |
b8b0708... HEAD@{1060}: commit: changed paid policy view cols | |
9fabf60... HEAD@{1061}: checkout: moving from master to _AddByAdvisortoPremium | |
9fabf60... HEAD@{1062}: checkout: moving from production to master | |
9fabf60... HEAD@{1063}: merge master: Fast forward | |
e727f14... HEAD@{1064}: checkout: moving from staging to production | |
9fabf60... HEAD@{1065}: merge master: Fast forward | |
3c9d8ae... HEAD@{1066}: checkout: moving from master to staging | |
9fabf60... HEAD@{1067}: pull : Fast forward | |
e727f14... HEAD@{1068}: checkout: moving from production to master | |
e727f14... HEAD@{1069}: merge master: Fast forward | |
2d9b76b... HEAD@{1070}: checkout: moving from master to production | |
e727f14... HEAD@{1071}: merge _AddPremColstoPolicy: Fast forward | |
2d9b76b... HEAD@{1072}: checkout: moving from _AddPremColstoPolicy to master | |
e727f14... HEAD@{1073}: commit: added addtl views and layout tweaks to Policies layouts | |
2d9b76b... HEAD@{1074}: checkout: moving from master to _AddPremColstoPolicy | |
2d9b76b... HEAD@{1075}: merge production: Fast forward | |
250ec82... HEAD@{1076}: checkout: moving from production to master | |
2d9b76b... HEAD@{1077}: commit: added gdc data files | |
f1e137e... HEAD@{1078}: commit: added more feedback to gdc importer | |
250ec82... HEAD@{1079}: merge master: Fast forward | |
3c9d8ae... HEAD@{1080}: checkout: moving from master to production | |
250ec82... HEAD@{1081}: merge _MiscKellyFixes: Fast forward | |
3c9d8ae... HEAD@{1082}: checkout: moving from _MiscKellyFixes to master | |
250ec82... HEAD@{1083}: commit: disable cross account check in team_membership.rb so teams can be added | |
3c9d8ae... HEAD@{1084}: checkout: moving from master to _MiscKellyFixes | |
3c9d8ae... HEAD@{1085}: checkout: moving from production to master | |
3c9d8ae... HEAD@{1086}: merge master: Fast forward | |
3efd7ee... HEAD@{1087}: checkout: moving from staging to production | |
3c9d8ae... HEAD@{1088}: merge master: Fast forward | |
3efd7ee... HEAD@{1089}: checkout: moving from master to staging | |
3c9d8ae... HEAD@{1090}: merge _MiscKellyFixes: Fast forward | |
d4c471c... HEAD@{1091}: checkout: moving from _MiscKellyFixes to master | |
3c9d8ae... HEAD@{1092}: commit: removed hidden form field in teams/new.html.erb | |
d4c471c... HEAD@{1093}: checkout: moving from master to _MiscKellyFixes | |
d4c471c... HEAD@{1094}: merge _createPremiumsImportScreen: Fast forward | |
3efd7ee... HEAD@{1095}: checkout: moving from _createPremiumsImportScreen to master | |
d4c471c... HEAD@{1096}: commit: added stub view for premium import | |
3efd7ee... HEAD@{1097}: checkout: moving from master to _createPremiumsImportScreen | |
3efd7ee... HEAD@{1098}: checkout: moving from staging to master | |
3efd7ee... HEAD@{1099}: merge master: Fast forward | |
3135f27... HEAD@{1100}: checkout: moving from master to staging | |
3efd7ee... HEAD@{1101}: merge production: Fast forward | |
3135f27... HEAD@{1102}: checkout: moving from production to master | |
3efd7ee... HEAD@{1103}: commit: forgot to move out of production branch | |
161a228... HEAD@{1104}: commit: update sr logos | |
1fdd196... HEAD@{1105}: commit: tweak session views | |
3135f27... HEAD@{1106}: merge master: Fast forward | |
aa8c19a... HEAD@{1107}: checkout: moving from staging to production | |
3135f27... HEAD@{1108}: merge master: Fast forward | |
aa8c19a... HEAD@{1109}: checkout: moving from master to staging | |
3135f27... HEAD@{1110}: merge _startEAPViews: Fast forward | |
aa8c19a... HEAD@{1111}: checkout: moving from _startEAPViews to master | |
3135f27... HEAD@{1112}: commit: Add SR Logo to Login & Footer | |
aa8c19a... HEAD@{1113}: checkout: moving from master to _startEAPViews | |
aa8c19a... HEAD@{1114}: checkout: moving from staging to master | |
aa8c19a... HEAD@{1115}: merge master: Fast forward | |
13de69b... HEAD@{1116}: checkout: moving from production to staging | |
aa8c19a... HEAD@{1117}: merge master: Fast forward | |
13de69b... HEAD@{1118}: checkout: moving from master to production | |
aa8c19a... HEAD@{1119}: merge _addMorePolicyViews: Fast forward | |
13de69b... HEAD@{1120}: checkout: moving from _addMorePolicyViews to master | |
aa8c19a... HEAD@{1121}: checkout: moving from master to _addMorePolicyViews | |
13de69b... HEAD@{1122}: checkout: moving from _addMorePolicyViews to master | |
aa8c19a... HEAD@{1123}: commit: added submitted tab to policies | |
13de69b... HEAD@{1124}: checkout: moving from master to _addMorePolicyViews | |
13de69b... HEAD@{1125}: checkout: moving from staging to master | |
13de69b... HEAD@{1126}: merge master: Fast forward | |
2730593... HEAD@{1127}: checkout: moving from production to staging | |
13de69b... HEAD@{1128}: merge master: Fast forward | |
2730593... HEAD@{1129}: checkout: moving from master to production | |
13de69b... HEAD@{1130}: merge _updateUserAddView: Fast forward | |
50a4cff... HEAD@{1131}: checkout: moving from _updateUserAddView to master | |
13de69b... HEAD@{1132}: commit: updated user admin screens | |
50a4cff... HEAD@{1133}: checkout: moving from master to _updateUserAddView | |
50a4cff... HEAD@{1134}: checkout: moving from _addActiveScaffold to master | |
50a4cff... HEAD@{1135}: checkout: moving from master to _addActiveScaffold | |
50a4cff... HEAD@{1136}: pull : Fast forward | |
2730593... HEAD@{1137}: checkout: moving from production to master | |
2730593... HEAD@{1138}: merge master: Fast forward | |
e9fc08f... HEAD@{1139}: checkout: moving from staging to production | |
2730593... HEAD@{1140}: merge master: Fast forward | |
4b2d3f9... HEAD@{1141}: checkout: moving from master to staging | |
2730593... HEAD@{1142}: merge _cleanupPolicySortingTable: Merge made by recursive. | |
4b2d3f9... HEAD@{1143}: checkout: moving from _cleanupPolicySortingTable to master | |
9410070... HEAD@{1144}: commit: set default policy sort to status_date | |
8d5abed... HEAD@{1145}: checkout: moving from master to _cleanupPolicySortingTable | |
4b2d3f9... HEAD@{1146}: checkout: moving from staging to master | |
4b2d3f9... HEAD@{1147}: merge master: Fast forward | |
e9fc08f... HEAD@{1148}: checkout: moving from master to staging | |
4b2d3f9... HEAD@{1149}: commit: added searchable module for Matt's review | |
8d5abed... HEAD@{1150}: merge _cleanupPolicySortingTable: Fast forward | |
1467d75... HEAD@{1151}: checkout: moving from _cleanupPolicySortingTable to master | |
8d5abed... HEAD@{1152}: commit: cleaned up new sorted policy listing | |
1467d75... HEAD@{1153}: checkout: moving from master to _cleanupPolicySortingTable | |
1467d75... HEAD@{1154}: checkout: moving from _improvePolicyViews to master | |
1467d75... HEAD@{1155}: checkout: moving from master to _improvePolicyViews | |
1467d75... HEAD@{1156}: pull : Fast forward | |
e9fc08f... HEAD@{1157}: checkout: moving from _addSearchableModule to master | |
e9fc08f... HEAD@{1158}: checkout: moving from master to _addSearchableModule | |
e9fc08f... HEAD@{1159}: checkout: moving from staging to master | |
e9fc08f... HEAD@{1160}: merge master: Fast forward | |
6ddd7e8... HEAD@{1161}: checkout: moving from production to staging | |
e9fc08f... HEAD@{1162}: merge master: Fast forward | |
6ddd7e8... HEAD@{1163}: checkout: moving from master to production | |
e9fc08f... HEAD@{1164}: merge _tryJqueryrowhighlighting: Fast forward | |
6ddd7e8... HEAD@{1165}: checkout: moving from _tryJqueryrowhighlighting to master | |
e9fc08f... HEAD@{1166}: commit: added table row highlighting w/ css | |
6ddd7e8... HEAD@{1167}: checkout: moving from master to _tryJqueryrowhighlighting | |
6ddd7e8... HEAD@{1168}: checkout: moving from _implement_policy_views to master | |
e1f0bc1... HEAD@{1169}: checkout: moving from master to _implement_policy_views | |
6ddd7e8... HEAD@{1170}: checkout: moving from staging to master | |
6ddd7e8... HEAD@{1171}: merge master: Fast forward | |
39a854f... HEAD@{1172}: checkout: moving from production to staging | |
6ddd7e8... HEAD@{1173}: checkout: moving from master to production | |
6ddd7e8... HEAD@{1174}: merge production: Fast forward | |
e1f0bc1... HEAD@{1175}: checkout: moving from production to master | |
6ddd7e8... HEAD@{1176}: commit: added basic search to policy listing & tweaked view | |
a5819a0... HEAD@{1177}: merge master: Merge made by recursive. | |
2e74247... HEAD@{1178}: checkout: moving from master to production | |
e1f0bc1... HEAD@{1179}: merge _implement_policy_views: Fast forward | |
39a854f... HEAD@{1180}: checkout: moving from _implement_policy_views to master | |
e1f0bc1... HEAD@{1181}: commit: updated policy listing view | |
6bc9a21... HEAD@{1182}: commit: added policy view tweaks | |
39a854f... HEAD@{1183}: checkout: moving from master to _implement_policy_views | |
39a854f... HEAD@{1184}: checkout: moving from production to master | |
2e74247... HEAD@{1185}: merge master: Merge made by recursive. | |
a9f2c5c... HEAD@{1186}: checkout: moving from staging to production | |
39a854f... HEAD@{1187}: merge master: Fast forward | |
0be4c1c... HEAD@{1188}: checkout: moving from master to staging | |
39a854f... HEAD@{1189}: merge _implement_policy_views: Fast forward | |
0be4c1c... HEAD@{1190}: checkout: moving from _implement_policy_views to master | |
39a854f... HEAD@{1191}: commit: added tab for new business & policies | |
0be4c1c... HEAD@{1192}: checkout: moving from master to _implement_policy_views | |
0be4c1c... HEAD@{1193}: checkout: moving from production to master | |
a9f2c5c... HEAD@{1194}: merge master: Merge made by recursive. | |
a6a967d... HEAD@{1195}: checkout: moving from staging to production | |
0be4c1c... HEAD@{1196}: merge master: Fast forward | |
d2a9a52... HEAD@{1197}: checkout: moving from master to staging | |
0be4c1c... HEAD@{1198}: merge _implement_policy_views: Fast forward | |
2793279... HEAD@{1199}: checkout: moving from _implement_policy_views to master | |
0be4c1c... HEAD@{1200}: checkout: moving from master to _implement_policy_views | |
2793279... HEAD@{1201}: checkout: moving from _implement_policy_views to master | |
0be4c1c... HEAD@{1202}: commit: finished changing management tab to managers | |
6240e3f... HEAD@{1203}: commit: changed management tab to managers | |
2793279... HEAD@{1204}: checkout: moving from master to _implement_policy_views | |
2793279... HEAD@{1205}: checkout: moving from designer to master | |
36a9eb8... HEAD@{1206}: commit (merge): merging to designer branch | |
7a0f41a... HEAD@{1207}: checkout: moving from master to designer | |
2793279... HEAD@{1208}: commit: adjusted logging of premium import | |
d2a9a52... HEAD@{1209}: checkout: moving from production to master | |
a6a967d... HEAD@{1210}: merge master: Merge made by recursive. | |
554c726... HEAD@{1211}: checkout: moving from staging to production | |
d2a9a52... HEAD@{1212}: merge master: Fast forward | |
49263ab... HEAD@{1213}: checkout: moving from master to staging | |
d2a9a52... HEAD@{1214}: merge _fixPremiumYTDSorting: Fast forward | |
49263ab... HEAD@{1215}: checkout: moving from _fixPremiumYTDSorting to master | |
d2a9a52... HEAD@{1216}: commit: fixed YTD sorting in premium summary. | |
49263ab... HEAD@{1217}: checkout: moving from master to _fixPremiumYTDSorting | |
49263ab... HEAD@{1218}: checkout: moving from staging to master | |
49263ab... HEAD@{1219}: merge master: Fast forward | |
a53cbc1... HEAD@{1220}: checkout: moving from production to staging | |
554c726... HEAD@{1221}: commit: working on defaults rake task | |
49263ab... HEAD@{1222}: merge master: Fast forward | |
a53cbc1... HEAD@{1223}: checkout: moving from master to production | |
49263ab... HEAD@{1224}: pull : Merge made by recursive. | |
d6fd3f5... HEAD@{1225}: commit: added defaults rake task | |
a53cbc1... HEAD@{1226}: checkout: moving from production to master | |
a53cbc1... HEAD@{1227}: merge master: Fast forward | |
851685f... HEAD@{1228}: pull : Fast forward | |
b7015c1... HEAD@{1229}: checkout: moving from staging to production | |
a53cbc1... HEAD@{1230}: merge master: Fast forward | |
10c08c6... HEAD@{1231}: checkout: moving from master to staging | |
a53cbc1... HEAD@{1232}: pull : Merge made by recursive. | |
ec3de82... HEAD@{1233}: commit: created custom 404 & 500 error pages for SR | |
76f5846... HEAD@{1234}: pull : Fast forward | |
10c08c6... HEAD@{1235}: checkout: moving from production to master | |
b7015c1... HEAD@{1236}: pull : Merge made by recursive. | |
754279b... HEAD@{1237}: merge master: Merge made by recursive. | |
58fcef0... HEAD@{1238}: checkout: moving from staging to production | |
10c08c6... HEAD@{1239}: merge master: Fast forward | |
05b7e20... HEAD@{1240}: checkout: moving from master to staging | |
10c08c6... HEAD@{1241}: pull : Fast forward | |
e6b4f5d... HEAD@{1242}: pull : Merge made by recursive. | |
aa4e2e6... HEAD@{1243}: merge staging: Merge made by recursive. | |
bbd76d0... HEAD@{1244}: checkout: moving from staging to master | |
05b7e20... HEAD@{1245}: pull : Fast forward | |
16fdb8a... HEAD@{1246}: checkout: moving from _cleanupUnitListingDeploy to staging | |
bbd76d0... HEAD@{1247}: checkout: moving from production to _cleanupUnitListingDeploy | |
58fcef0... HEAD@{1248}: checkout: moving from master to production | |
bbd76d0... HEAD@{1249}: checkout: moving from _cleanupUnitListingDeploy to master | |
bbd76d0... HEAD@{1250}: checkout: moving from master to _cleanupUnitListingDeploy | |
bbd76d0... HEAD@{1251}: checkout: moving from production to master | |
58fcef0... HEAD@{1252}: merge master: Merge made by recursive. | |
15282b4... HEAD@{1253}: checkout: moving from master to production | |
bbd76d0... HEAD@{1254}: commit: fixed pathing that got stomped in _unit.html.haml | |
3097dcd... HEAD@{1255}: checkout: moving from production to master | |
15282b4... HEAD@{1256}: merge master: Merge made by recursive. | |
8a9f479... HEAD@{1257}: checkout: moving from master to production | |
3097dcd... HEAD@{1258}: commit: disabled validate :no_cross_account temporarily to allow for new team creation. | |
16fdb8a... HEAD@{1259}: checkout: moving from production to master | |
8a9f479... HEAD@{1260}: merge master: Merge made by recursive. | |
6ccbc70... HEAD@{1261}: checkout: moving from staging to production | |
16fdb8a... HEAD@{1262}: merge master: Fast forward | |
9be47d8... HEAD@{1263}: checkout: moving from master to staging | |
16fdb8a... HEAD@{1264}: merge _TeamListingNavigation: Fast forward | |
1ac4def... HEAD@{1265}: checkout: moving from _TeamListingNavigation to master | |
16fdb8a... HEAD@{1266}: commit: Finished moving premium unit listing to correct tab | |
849d07d... HEAD@{1267}: commit (merge): fixed conflict w/ Jaime's total code | |
27b75fc... HEAD@{1268}: checkout: moving from master to _TeamListingNavigation | |
1ac4def... HEAD@{1269}: pull : Merge made by recursive. | |
9356532... HEAD@{1270}: checkout: moving from _TeamListingNavigation to master | |
27b75fc... HEAD@{1271}: commit: moved unit report to premium tab | |
9356532... HEAD@{1272}: checkout: moving from staging to _TeamListingNavigation | |
9be47d8... HEAD@{1273}: checkout: moving from _TeamListingNavigation to staging | |
9356532... HEAD@{1274}: checkout: moving from staging to _TeamListingNavigation | |
9be47d8... HEAD@{1275}: checkout: moving from _TeamListingNavigation to staging | |
9356532... HEAD@{1276}: checkout: moving from master to _TeamListingNavigation | |
9356532... HEAD@{1277}: pull : Merge made by recursive. | |
f47f577... HEAD@{1278}: commit (merge): fixed conflict w/ older policy.rb association | |
003459e... HEAD@{1279}: commit: added associations to policy_events, policies and users tables | |
a48dc96... HEAD@{1280}: commit: added associations to policy_events, policies and users tables | |
5daa8bc... HEAD@{1281}: merge _updatePolicySchema: Fast forward | |
91f684e... HEAD@{1282}: checkout: moving from _updatePolicySchema to master | |
5daa8bc... HEAD@{1283}: commit: added policy_shares table. not implemented yet | |
91f684e... HEAD@{1284}: checkout: moving from master to _updatePolicySchema | |
91f684e... HEAD@{1285}: merge _updatePolicySchema: Fast forward | |
7d47a5f... HEAD@{1286}: checkout: moving from _updatePolicySchema to master | |
91f684e... HEAD@{1287}: commit: updated policy & policy_events table schemas | |
7d47a5f... HEAD@{1288}: checkout: moving from master to _updatePolicySchema | |
7d47a5f... HEAD@{1289}: checkout: moving from _UnderwritingTweaks to master | |
7d47a5f... HEAD@{1290}: merge master: Fast forward | |
0d53333... HEAD@{1291}: checkout: moving from master to _UnderwritingTweaks | |
7d47a5f... HEAD@{1292}: pull : Merge made by recursive. | |
0d53333... HEAD@{1293}: checkout: moving from _UnderwritingTweaks to master | |
0d53333... HEAD@{1294}: checkout: moving from master to _UnderwritingTweaks | |
0d53333... HEAD@{1295}: checkout: moving from _UnderwritingTweaks to master | |
0d53333... HEAD@{1296}: checkout: moving from master to _UnderwritingTweaks | |
0d53333... HEAD@{1297}: checkout: moving from _PoliciesTweak to master | |
0d53333... HEAD@{1298}: merge master: Fast forward | |
69e73e6... HEAD@{1299}: checkout: moving from master to _PoliciesTweak | |
0d53333... HEAD@{1300}: commit (merge): tweaking underwriting.rb | |
61e778e... HEAD@{1301}: commit: tweaking underwriting.rb | |
69e73e6... HEAD@{1302}: checkout: moving from _PoliciesTweak to master | |
69e73e6... HEAD@{1303}: merge master: Fast forward | |
79c59b4... HEAD@{1304}: checkout: moving from master to _PoliciesTweak | |
69e73e6... HEAD@{1305}: pull : Merge made by recursive. | |
1f2d977... HEAD@{1306}: commit: prep for Jaime's rake task | |
79c59b4... HEAD@{1307}: checkout: moving from _PoliciesTweak to master | |
79c59b4... HEAD@{1308}: checkout: moving from master to _PoliciesTweak | |
79c59b4... HEAD@{1309}: merge _newUnderwritingWork: Merge made by recursive. | |
dd00fda... HEAD@{1310}: pull : Fast forward | |
ac968a3... HEAD@{1311}: checkout: moving from _newUnderwritingWork to master | |
6bc6199... HEAD@{1312}: commit: added updated premiums data | |
ac968a3... HEAD@{1313}: checkout: moving from master to _newUnderwritingWork | |
ac968a3... HEAD@{1314}: pull : Fast forward | |
9be47d8... HEAD@{1315}: checkout: moving from production to master | |
6ccbc70... HEAD@{1316}: merge master: Merge made by recursive. | |
6f05087... HEAD@{1317}: checkout: moving from staging to production | |
9be47d8... HEAD@{1318}: merge master: Fast forward | |
44c22a5... HEAD@{1319}: checkout: moving from master to staging | |
9be47d8... HEAD@{1320}: merge _premium_list_by_unit: Fast forward | |
44c22a5... HEAD@{1321}: checkout: moving from _premium_list_by_unit to master | |
9be47d8... HEAD@{1322}: commit: posted mockup of premium listing by unit | |
44c22a5... HEAD@{1323}: checkout: moving from master to _premium_list_by_unit | |
44c22a5... HEAD@{1324}: checkout: moving from production to master | |
6f05087... HEAD@{1325}: merge master: Merge made by recursive. | |
2c5f62f... HEAD@{1326}: checkout: moving from staging to production | |
44c22a5... HEAD@{1327}: merge master: Fast forward | |
9ae2e75... HEAD@{1328}: checkout: moving from master to staging | |
44c22a5... HEAD@{1329}: merge _make_units: Fast forward | |
212a502... HEAD@{1330}: checkout: moving from _make_units to master | |
44c22a5... HEAD@{1331}: commit: added basic team listing/editing | |
212a502... HEAD@{1332}: merge master: Fast forward | |
9ae2e75... HEAD@{1333}: checkout: moving from master to _make_units | |
212a502... HEAD@{1334}: pull : Fast forward | |
9ae2e75... HEAD@{1335}: checkout: moving from staging to master | |
9ae2e75... HEAD@{1336}: checkout: moving from _make_units to staging | |
9ae2e75... HEAD@{1337}: checkout: moving from staging to _make_units | |
9ae2e75... HEAD@{1338}: checkout: moving from _moveNewBusBacktoManagement to staging | |
9ae2e75... HEAD@{1339}: checkout: moving from master to _moveNewBusBacktoManagement | |
9ae2e75... HEAD@{1340}: checkout: moving from staging to master | |
9ae2e75... HEAD@{1341}: checkout: moving from _moveNewBusBacktoManagement to staging | |
9ae2e75... HEAD@{1342}: checkout: moving from master to _moveNewBusBacktoManagement | |
9ae2e75... HEAD@{1343}: checkout: moving from _myNewBranch to master | |
9ae2e75... HEAD@{1344}: checkout: moving from master to _myNewBranch | |
9ae2e75... HEAD@{1345}: checkout: moving from _moveNewBusBacktoManagement to master | |
9ae2e75... HEAD@{1346}: checkout: moving from master to _moveNewBusBacktoManagement | |
9ae2e75... HEAD@{1347}: checkout: moving from production to master | |
2c5f62f... HEAD@{1348}: merge master: Merge made by recursive. | |
55ae559... HEAD@{1349}: checkout: moving from staging to production | |
9ae2e75... HEAD@{1350}: merge master: Fast forward | |
649635c... HEAD@{1351}: checkout: moving from master to staging | |
9ae2e75... HEAD@{1352}: merge _add_latest_date_to_paidforview: Fast forward | |
4aa4aa2... HEAD@{1353}: checkout: moving from _add_latest_date_to_paidforview to master | |
9ae2e75... HEAD@{1354}: commit: added latest entry to paid-for view | |
649635c... HEAD@{1355}: checkout: moving from staging to _add_latest_date_to_paidforview | |
649635c... HEAD@{1356}: checkout: moving from production to staging | |
55ae559... HEAD@{1357}: commit (merge): fixing merge conflict | |
6d8c23e... HEAD@{1358}: commit (merge): merging conflict | |
ce37c43... HEAD@{1359}: checkout: moving from staging to production | |
649635c... HEAD@{1360}: commit: removed advisors resoures video links per Paul Adams | |
9009472... HEAD@{1361}: pull : Merge made by recursive. | |
d626fcb... HEAD@{1362}: checkout: moving from master to staging | |
4aa4aa2... HEAD@{1363}: checkout: moving from _add_tags to master | |
67939e0... HEAD@{1364}: commit: removed advisor resources video info | |
4aa4aa2... HEAD@{1365}: checkout: moving from master to _add_tags | |
4aa4aa2... HEAD@{1366}: checkout: moving from staging to master | |
d626fcb... HEAD@{1367}: merge _fix_premium_summary: Merge made by recursive. | |
92e3d0a... HEAD@{1368}: pull : Fast forward | |
4aa4aa2... HEAD@{1369}: checkout: moving from _fix_premium_summary to staging | |
a337f49... HEAD@{1370}: commit: preparations for premiums detail | |
4aa4aa2... HEAD@{1371}: checkout: moving from master to _fix_premium_summary | |
4aa4aa2... HEAD@{1372}: checkout: moving from staging to master | |
4aa4aa2... HEAD@{1373}: merge master: Fast forward | |
39b0f17... HEAD@{1374}: checkout: moving from master to staging | |
4aa4aa2... HEAD@{1375}: commit: fixed PaidFor data csv files to match importer expectations and 2008 data | |
39b0f17... HEAD@{1376}: checkout: moving from staging to master | |
39b0f17... HEAD@{1377}: merge master: Fast forward | |
4f9abc1... HEAD@{1378}: checkout: moving from master to staging | |
39b0f17... HEAD@{1379}: commit: prep for updating PaidFor data | |
2f7d1c2... HEAD@{1380}: checkout: moving from add_tagging to master | |
2f7d1c2... HEAD@{1381}: checkout: moving from master to add_tagging | |
2f7d1c2... HEAD@{1382}: commit: added re-exported PaidFor Data | |
4f9abc1... HEAD@{1383}: merge staging: Fast forward | |
6e6b4b0... HEAD@{1384}: checkout: moving from staging to master | |
4f9abc1... HEAD@{1385}: commit: added doc notes re: server file size | |
6d20dff... HEAD@{1386}: checkout: moving from production to staging | |
ce37c43... HEAD@{1387}: merge staging: Merge made by recursive. | |
ce3892c... HEAD@{1388}: checkout: moving from staging to production | |
6d20dff... HEAD@{1389}: pull : Fast forward | |
c4a4d76... HEAD@{1390}: checkout: moving from production to staging | |
ce3892c... HEAD@{1391}: commit: detail view tweak for IE | |
c4a4d76... HEAD@{1392}: merge staging: Fast forward | |
f62d5e8... HEAD@{1393}: checkout: moving from staging to production | |
c4a4d76... HEAD@{1394}: merge _add_new_business_module: Fast forward | |
f62d5e8... HEAD@{1395}: checkout: moving from _add_new_business_module to staging | |
c4a4d76... HEAD@{1396}: commit: fleshed out new Business main menu items and underwriting view (raw data) | |
f62d5e8... HEAD@{1397}: checkout: moving from staging to _add_new_business_module | |
f62d5e8... HEAD@{1398}: merge production: Fast forward | |
da7a76d... HEAD@{1399}: checkout: moving from production to staging | |
f62d5e8... HEAD@{1400}: commit: more ie css shenanigans | |
7eaf3b6... HEAD@{1401}: commit: More wasted moments of my life making IE play nice | |
2b63390... HEAD@{1402}: commit: css tweaks to selectors | |
da7a76d... HEAD@{1403}: merge staging: Fast forward | |
b392584... HEAD@{1404}: checkout: moving from staging to production | |
da7a76d... HEAD@{1405}: merge _fix_account.rb: Fast forward | |
b392584... HEAD@{1406}: checkout: moving from _fix_account.rb to staging | |
da7a76d... HEAD@{1407}: commit: Cleaned up premium views. Fixed my mucking up of Jaime's beautiful code. Tweaked selector blocks | |
b392584... HEAD@{1408}: checkout: moving from staging to _fix_account.rb | |
b392584... HEAD@{1409}: checkout: moving from production to staging | |
b392584... HEAD@{1410}: merge staging: Fast forward | |
3979dfe... HEAD@{1411}: checkout: moving from staging to production | |
b392584... HEAD@{1412}: pull : Merge made by recursive. | |
fc8fe0c... HEAD@{1413}: commit: cleaned up premiums scheme after YTD working | |
ab3bd89... HEAD@{1414}: commit (merge): merging Jaime's ytd code | |
ffe5490... HEAD@{1415}: commit: added back in new premium views to Jaime's year code | |
3c02696... HEAD@{1416}: commit: fleshed out premiums pages | |
235ee17... HEAD@{1417}: checkout: moving from _new_premium_listings to staging | |
235ee17... HEAD@{1418}: merge staging: Fast forward | |
c2b5f09... HEAD@{1419}: checkout: moving from staging to _new_premium_listings | |
235ee17... HEAD@{1420}: pull : Fast forward | |
c2b5f09... HEAD@{1421}: checkout: moving from _new_premium_listings to staging | |
c2b5f09... HEAD@{1422}: checkout: moving from staging to _new_premium_listings | |
c2b5f09... HEAD@{1423}: merge _clean_up_premium_view: Fast forward | |
89953ff... HEAD@{1424}: checkout: moving from _clean_up_premium_view to staging | |
c2b5f09... HEAD@{1425}: commit: added menu3 & stub layouts to premium | |
89953ff... HEAD@{1426}: checkout: moving from staging to _clean_up_premium_view | |
89953ff... HEAD@{1427}: checkout: moving from _addtl_premiums_views to staging | |
89953ff... HEAD@{1428}: merge staging: Fast forward | |
437bf1b... HEAD@{1429}: checkout: moving from staging to _addtl_premiums_views | |
89953ff... HEAD@{1430}: pull : Fast forward | |
437bf1b... HEAD@{1431}: checkout: moving from _addtl_premiums_views to staging | |
437bf1b... HEAD@{1432}: checkout: moving from staging to _addtl_premiums_views | |
437bf1b... HEAD@{1433}: merge _addtl_premiums_views: Fast forward | |
3979dfe... HEAD@{1434}: checkout: moving from _addtl_premiums_views to staging | |
437bf1b... HEAD@{1435}: commit: added payment_events raw data for 05-07 | |
3979dfe... HEAD@{1436}: checkout: moving from staging to _addtl_premiums_views | |
3979dfe... HEAD@{1437}: checkout: moving from production to staging | |
3979dfe... HEAD@{1438}: merge staging: Fast forward | |
f1147a8... HEAD@{1439}: checkout: moving from staging to production | |
3979dfe... HEAD@{1440}: commit: updated will_paginate styling | |
12bcb85... HEAD@{1441}: pull : Fast forward | |
a8f458a... HEAD@{1442}: pull : Fast forward | |
56cef11... HEAD@{1443}: pull : Fast forward | |
62c8e5f... HEAD@{1444}: checkout: moving from _implement_monthly_links to staging | |
62c8e5f... HEAD@{1445}: checkout: moving from staging to _implement_monthly_links | |
62c8e5f... HEAD@{1446}: pull : Fast forward | |
bedbe89... HEAD@{1447}: pull : Fast forward | |
9e5b132... HEAD@{1448}: merge _paginate_premiums: Merge made by recursive. | |
f78b71f... HEAD@{1449}: pull : Fast forward | |
c2b0a60... HEAD@{1450}: checkout: moving from _paginate_premiums to staging | |
d03f847... HEAD@{1451}: commit: adding will_paginate to premiums | |
c2b0a60... HEAD@{1452}: checkout: moving from staging to _paginate_premiums | |
c2b0a60... HEAD@{1453}: checkout: moving from _gdc_payout_interface to staging | |
c2b0a60... HEAD@{1454}: checkout: moving from staging to _gdc_payout_interface | |
c2b0a60... HEAD@{1455}: pull : Fast forward | |
f1147a8... HEAD@{1456}: checkout: moving from _gdc_payout_dev to staging | |
f1147a8... HEAD@{1457}: checkout: moving from staging to _gdc_payout_dev | |
f1147a8... HEAD@{1458}: checkout: moving from production to staging | |
f1147a8... HEAD@{1459}: merge staging: Fast forward | |
5a3612f... HEAD@{1460}: checkout: moving from staging to production | |
f1147a8... HEAD@{1461}: merge _gdc_payout_dev: Fast forward | |
5a3612f... HEAD@{1462}: checkout: moving from _gdc_payout_dev to staging | |
f1147a8... HEAD@{1463}: commit: added 1st iteration of gdc payout sandbox | |
5a3612f... HEAD@{1464}: checkout: moving from staging to _gdc_payout_dev | |
5a3612f... HEAD@{1465}: checkout: moving from production to staging | |
5a3612f... HEAD@{1466}: merge staging: Fast forward | |
d4a9427... HEAD@{1467}: checkout: moving from staging to production | |
5a3612f... HEAD@{1468}: merge _gdc_payout_dev: Fast forward | |
e83fe55... HEAD@{1469}: checkout: moving from _gdc_payout_dev to staging | |
5a3612f... HEAD@{1470}: commit: updated gdc reports | |
e83fe55... HEAD@{1471}: checkout: moving from staging to _gdc_payout_dev | |
e83fe55... HEAD@{1472}: commit: merged in new gdc totals from Matt | |
b45b406... HEAD@{1473}: pull : Fast forward | |
d4a9427... HEAD@{1474}: checkout: moving from production to staging | |
d4a9427... HEAD@{1475}: checkout: moving from staging to production | |
d4a9427... HEAD@{1476}: checkout: moving from production to staging | |
d4a9427... HEAD@{1477}: merge staging: Fast forward | |
8c4c5ed... HEAD@{1478}: checkout: moving from staging to production | |
d4a9427... HEAD@{1479}: merge _add_gdc_profitability: Fast forward | |
8c4c5ed... HEAD@{1480}: checkout: moving from _add_gdc_profitability to staging | |
d4a9427... HEAD@{1481}: commit: created menu 3 and gdc payouts report | |
8c4c5ed... HEAD@{1482}: checkout: moving from staging to _add_gdc_profitability | |
8c4c5ed... HEAD@{1483}: checkout: moving from production to staging | |
8c4c5ed... HEAD@{1484}: merge staging: Fast forward | |
9a34857... HEAD@{1485}: pull : Fast forward | |
d44669d... HEAD@{1486}: checkout: moving from staging to production | |
8c4c5ed... HEAD@{1487}: merge _fixTheDockLinks: Fast forward | |
9a34857... HEAD@{1488}: checkout: moving from _fixTheDockLinks to staging | |
8c4c5ed... HEAD@{1489}: commit: updated the dock contents pages | |
9a34857... HEAD@{1490}: checkout: moving from staging to _fixTheDockLinks | |
9a34857... HEAD@{1491}: pull : Fast forward | |
8317eb1... HEAD@{1492}: pull : Fast forward | |
be462c3... HEAD@{1493}: checkout: moving from _AdvisorWork to staging | |
be462c3... HEAD@{1494}: checkout: moving from staging to _AdvisorWork | |
be462c3... HEAD@{1495}: checkout: moving from production to staging | |
d44669d... HEAD@{1496}: merge staging: Merge made by recursive. | |
20b8223... HEAD@{1497}: checkout: moving from staging to production | |
be462c3... HEAD@{1498}: merge _updateMgmtAdvisorListing: Fast forward | |
b27399f... HEAD@{1499}: checkout: moving from _updateMgmtAdvisorListing to staging | |
be462c3... HEAD@{1500}: commit: mgmt advisor list updates | |
b27399f... HEAD@{1501}: checkout: moving from staging to _updateMgmtAdvisorListing | |
b27399f... HEAD@{1502}: checkout: moving from production to staging | |
20b8223... HEAD@{1503}: merge staging: Merge made by recursive. | |
ddbbafc... HEAD@{1504}: checkout: moving from staging to production | |
b27399f... HEAD@{1505}: merge _improveAdvisorListing: Fast forward | |
48ae4f4... HEAD@{1506}: checkout: moving from _improveAdvisorListing to staging | |
b27399f... HEAD@{1507}: commit: added more AdvisorAttributes | |
48ae4f4... HEAD@{1508}: checkout: moving from staging to _improveAdvisorListing | |
48ae4f4... HEAD@{1509}: checkout: moving from production to staging | |
ddbbafc... HEAD@{1510}: merge staging: Merge made by recursive. | |
be186e0... HEAD@{1511}: checkout: moving from staging to production | |
48ae4f4... HEAD@{1512}: merge _addStaffCheck: Fast forward | |
ecc19f8... HEAD@{1513}: checkout: moving from _addStaffCheck to staging | |
48ae4f4... HEAD@{1514}: commit: advisor data field & listing upgrade | |
ecc19f8... HEAD@{1515}: merge staging: Fast forward | |
a146af1... HEAD@{1516}: checkout: moving from _addStaffCheck to _addStaffCheck | |
a146af1... HEAD@{1517}: checkout: moving from _addAddtlUserAttributes to _addStaffCheck | |
ecc19f8... HEAD@{1518}: checkout: moving from staging to _addAddtlUserAttributes | |
ecc19f8... HEAD@{1519}: checkout: moving from _addStaffCheck to staging | |
a146af1... HEAD@{1520}: checkout: moving from staging to _addStaffCheck | |
ecc19f8... HEAD@{1521}: checkout: moving from production to staging | |
be186e0... HEAD@{1522}: commit: added new OrgBoard pdf | |
ecc19f8... HEAD@{1523}: merge staging: Fast forward | |
ce1af48... HEAD@{1524}: checkout: moving from staging to production | |
ecc19f8... HEAD@{1525}: pull : Merge made by recursive. | |
8a01505... HEAD@{1526}: commit: added advisor resource / video page | |
a146af1... HEAD@{1527}: checkout: moving from _addStaffCheck to staging | |
a146af1... HEAD@{1528}: checkout: moving from staging to _addStaffCheck | |
a146af1... HEAD@{1529}: commit: added some doc notes | |
de9c7d3... HEAD@{1530}: pull : Merge made by recursive. | |
69ed7c4... HEAD@{1531}: commit: updated premium listing views | |
717fe4c... HEAD@{1532}: pull : Fast forward | |
ce1af48... HEAD@{1533}: checkout: moving from _morepremiumListing to staging | |
ce1af48... HEAD@{1534}: checkout: moving from staging to _morepremiumListing | |
ce1af48... HEAD@{1535}: checkout: moving from production to staging | |
ce1af48... HEAD@{1536}: merge staging: Fast forward | |
4b6ffa4... HEAD@{1537}: checkout: moving from staging to production | |
ce1af48... HEAD@{1538}: merge _fixMgmtHomePage: Fast forward | |
4b6ffa4... HEAD@{1539}: checkout: moving from _fixMgmtHomePage to staging | |
ce1af48... HEAD@{1540}: commit: added default home page for management | |
4b6ffa4... HEAD@{1541}: checkout: moving from staging to _fixMgmtHomePage | |
4b6ffa4... HEAD@{1542}: checkout: moving from production to staging | |
4b6ffa4... HEAD@{1543}: merge staging: Fast forward | |
967749c... HEAD@{1544}: pull : Fast forward | |
95db0d7... HEAD@{1545}: checkout: moving from staging to production | |
4b6ffa4... HEAD@{1546}: merge _mattbugfixtoListings: Fast forward | |
967749c... HEAD@{1547}: checkout: moving from _mattbugfixtoListings to staging | |
4b6ffa4... HEAD@{1548}: commit: checking to see if noverify option works | |
49c1f58... HEAD@{1549}: merge _improvePremiumListing2: Merge made by recursive. | |
967749c... HEAD@{1550}: checkout: moving from staging to _mattbugfixtoListings | |
967749c... HEAD@{1551}: pull : Fast forward | |
95db0d7... HEAD@{1552}: checkout: moving from _improvePremiumListing2 to staging | |
c156d47... HEAD@{1553}: commit: tweaking navigation & tabs" | |
95db0d7... HEAD@{1554}: checkout: moving from staging to _improvePremiumListing2 | |
95db0d7... HEAD@{1555}: checkout: moving from production to staging | |
95db0d7... HEAD@{1556}: merge staging: Fast forward | |
4194dde... HEAD@{1557}: checkout: moving from staging to production | |
95db0d7... HEAD@{1558}: pull : Merge made by recursive. | |
cd36cc1... HEAD@{1559}: merge _improve_premiumlisting: Fast forward | |
4194dde... HEAD@{1560}: checkout: moving from _improve_premiumlisting to staging | |
cd36cc1... HEAD@{1561}: commit: added master dev pwd functionality | |
4194dde... HEAD@{1562}: checkout: moving from staging to _improve_premiumlisting | |
4194dde... HEAD@{1563}: checkout: moving from production to staging | |
4194dde... HEAD@{1564}: checkout: moving from _tweakPaidFor to production | |
4194dde... HEAD@{1565}: checkout: moving from staging to _tweakPaidFor | |
4194dde... HEAD@{1566}: checkout: moving from production to staging | |
4194dde... HEAD@{1567}: merge staging: Fast forward | |
87ba0b3... HEAD@{1568}: checkout: moving from staging to production | |
4194dde... HEAD@{1569}: merge _tweakPaidFor: Fast forward | |
f2ec4c1... HEAD@{1570}: checkout: moving from _tweakPaidFor to staging | |
4194dde... HEAD@{1571}: commit: initial field of PaidFor | |
f2ec4c1... HEAD@{1572}: checkout: moving from staging to _tweakPaidFor | |
f2ec4c1... HEAD@{1573}: pull : Fast forward | |
87ba0b3... HEAD@{1574}: checkout: moving from _Matts_PaidForWork to staging | |
54b3c05... HEAD@{1575}: commit: merged Matt's paidfor with staging2 | |
190bab6... HEAD@{1576}: commit (merge): merged Matt's paidfor with staging | |
6e6b4b0... HEAD@{1577}: checkout: moving from master to _Matts_PaidForWork | |
6e6b4b0... HEAD@{1578}: pull : Fast forward | |
a5b3ed5... HEAD@{1579}: checkout: moving from staging to master | |
87ba0b3... HEAD@{1580}: merge production: Fast forward | |
37b613c... HEAD@{1581}: checkout: moving from production to staging | |
87ba0b3... HEAD@{1582}: commit: added google analytics to production ENV | |
37b613c... HEAD@{1583}: merge staging: Fast forward | |
0070ab2... HEAD@{1584}: checkout: moving from staging to production | |
37b613c... HEAD@{1585}: commit: changed mongrels to 3 for production | |
0070ab2... HEAD@{1586}: checkout: moving from production to staging | |
0070ab2... HEAD@{1587}: merge staging: Fast forward | |
3874ea9... HEAD@{1588}: checkout: moving from staging to production | |
0070ab2... HEAD@{1589}: commit: ie tweaks and remove remember me at login | |
ebb4e9c... HEAD@{1590}: merge _submenu_tabs: Fast forward | |
ca47e03... HEAD@{1591}: checkout: moving from _submenu_tabs to staging | |
ebb4e9c... HEAD@{1592}: commit: completed sub nav and prepped for initial user rollout | |
fac96bd... HEAD@{1593}: checkout: moving from master to _submenu_tabs | |
a5b3ed5... HEAD@{1594}: merge _submenu_tabs: Merge made by recursive. | |
47b5184... HEAD@{1595}: checkout: moving from _submenu_tabs to master | |
fac96bd... HEAD@{1596}: commit: working on subnav tabs | |
53c07bd... HEAD@{1597}: commit: working on subnav tabs | |
3b8ed37... HEAD@{1598}: checkout: moving from staging to _submenu_tabs | |
ca47e03... HEAD@{1599}: checkout: moving from _submenu_tabs to staging | |
3b8ed37... HEAD@{1600}: commit: got basic submenu working | |
ca47e03... HEAD@{1601}: checkout: moving from staging to _submenu_tabs | |
ca47e03... HEAD@{1602}: commit: nothing to see here | |
3874ea9... HEAD@{1603}: merge production: Fast forward | |
9e0e59d... HEAD@{1604}: checkout: moving from production to staging | |
3874ea9... HEAD@{1605}: commit: added AA screenshots for UI Work | |
9e0e59d... HEAD@{1606}: merge staging: Fast forward | |
cd65b0a... HEAD@{1607}: checkout: moving from staging to production | |
9e0e59d... HEAD@{1608}: merge _fix_tabs_ie7: Fast forward | |
6328596... HEAD@{1609}: checkout: moving from _fix_tabs_ie7 to staging | |
9e0e59d... HEAD@{1610}: commit: fixed IE7 issue (min width) | |
6328596... HEAD@{1611}: checkout: moving from staging to _fix_tabs_ie7 | |
6328596... HEAD@{1612}: commit: added new Sept ARP Report | |
67d3010... HEAD@{1613}: commit: more IE fixes | |
f99344c... HEAD@{1614}: commit: here we go IE fixing again. weeee | |
f3317f6... HEAD@{1615}: commit: updated main menu to tabs | |
806dcb4... HEAD@{1616}: commit: more main menu work | |
cd65b0a... HEAD@{1617}: merge production: Fast forward | |
fab1afc... HEAD@{1618}: checkout: moving from production to staging | |
cd65b0a... HEAD@{1619}: commit: refactor main menu to tabs | |
fab1afc... HEAD@{1620}: merge staging: Fast forward | |
5418ac8... HEAD@{1621}: checkout: moving from staging to production | |
fab1afc... HEAD@{1622}: merge _advisor_ui: Fast forward | |
5418ac8... HEAD@{1623}: checkout: moving from _advisor_ui to staging | |
fab1afc... HEAD@{1624}: commit: smallified header height | |
5418ac8... HEAD@{1625}: checkout: moving from staging to _advisor_ui | |
5418ac8... HEAD@{1626}: checkout: moving from production to staging | |
5418ac8... HEAD@{1627}: merge staging: Fast forward | |
7799abd... HEAD@{1628}: checkout: moving from staging to production | |
5418ac8... HEAD@{1629}: pull : Merge made by recursive. | |
1abcec5... HEAD@{1630}: commit: added production mysql backup | |
7799abd... HEAD@{1631}: checkout: moving from production to staging | |
7799abd... HEAD@{1632}: merge staging: Fast forward | |
1bfb0c8... HEAD@{1633}: checkout: moving from staging to production | |
7799abd... HEAD@{1634}: pull : Fast forward | |
d7cac45... HEAD@{1635}: merge _tabs_in_performance_pages: Fast forward | |
1bfb0c8... HEAD@{1636}: checkout: moving from _tabs_in_performance_pages to staging | |
d7cac45... HEAD@{1637}: commit: Moved advisors performance to tabs interface. Still some issues. | |
c951608... HEAD@{1638}: commit: fixed remember me on login screen | |
1bfb0c8... HEAD@{1639}: checkout: moving from staging to _tabs_in_performance_pages | |
1bfb0c8... HEAD@{1640}: pull : Fast forward | |
1a3c1cc... HEAD@{1641}: checkout: moving from production to staging | |
1bfb0c8... HEAD@{1642}: pull : Fast forward | |
1a3c1cc... HEAD@{1643}: merge staging: Fast forward | |
e74553b... HEAD@{1644}: checkout: moving from staging to production | |
1a3c1cc... HEAD@{1645}: pull : Merge made by recursive. | |
e74553b... HEAD@{1646}: checkout: moving from _add_new_total to staging | |
e74553b... HEAD@{1647}: checkout: moving from staging to _add_new_total | |
e74553b... HEAD@{1648}: checkout: moving from _rfpf_work to staging | |
e74553b... HEAD@{1649}: checkout: moving from staging to _rfpf_work | |
e74553b... HEAD@{1650}: checkout: moving from _rfpf_work to staging | |
e74553b... HEAD@{1651}: checkout: moving from staging to _rfpf_work | |
e74553b... HEAD@{1652}: merge production: Fast forward | |
396cb2a... HEAD@{1653}: checkout: moving from production to staging | |
e74553b... HEAD@{1654}: commit: added production mysql backups | |
5420f3e... HEAD@{1655}: commit: added login to password_reset email | |
396cb2a... HEAD@{1656}: merge staging: Fast forward | |
81efa5e... HEAD@{1657}: checkout: moving from staging to production | |
396cb2a... HEAD@{1658}: checkout: moving from designer to staging | |
7a0f41a... HEAD@{1659}: pull : Fast forward | |
82c3da0... HEAD@{1660}: checkout: moving from staging to designer | |
396cb2a... HEAD@{1661}: merge _update_home_page: Fast forward | |
1ca6123... HEAD@{1662}: checkout: moving from _update_home_page to staging | |
396cb2a... HEAD@{1663}: commit: changed 'from email' | |
1ca6123... HEAD@{1664}: checkout: moving from staging to _update_home_page | |
1ca6123... HEAD@{1665}: merge _update_home_page: Fast forward | |
8037655... HEAD@{1666}: checkout: moving from _update_home_page to staging | |
1ca6123... HEAD@{1667}: commit: home page work & staff usernames data | |
8037655... HEAD@{1668}: checkout: moving from staging to _update_home_page | |
8037655... HEAD@{1669}: commit: deleted footnotes for now. | |
7088d54... HEAD@{1670}: commit: added thedock.haml static page | |
c260fb4... HEAD@{1671}: merge _haml_conversion_work: Fast forward | |
78d5c5b... HEAD@{1672}: checkout: moving from _haml_conversion_work to staging | |
c260fb4... HEAD@{1673}: commit: converting view files to haml | |
78d5c5b... HEAD@{1674}: checkout: moving from staging to _haml_conversion_work | |
78d5c5b... HEAD@{1675}: commit: added data docs | |
d44d41a... HEAD@{1676}: pull : Fast forward | |
81efa5e... HEAD@{1677}: checkout: moving from production to staging | |
81efa5e... HEAD@{1678}: merge staging: Fast forward | |
0fc0fbb... HEAD@{1679}: checkout: moving from staging to production | |
81efa5e... HEAD@{1680}: merge _advisor_ui_updates: Fast forward | |
0fc0fbb... HEAD@{1681}: checkout: moving from _advisor_ui_updates to staging | |
81efa5e... HEAD@{1682}: commit: updated edit form styling | |
0fc0fbb... HEAD@{1683}: checkout: moving from staging to _advisor_ui_updates | |
0fc0fbb... HEAD@{1684}: checkout: moving from production to staging | |
0fc0fbb... HEAD@{1685}: merge staging: Fast forward | |
82c3da0... HEAD@{1686}: checkout: moving from staging to production | |
0fc0fbb... HEAD@{1687}: commit: removed accounts menubar for preferences view (unless admin) | |
82c3da0... HEAD@{1688}: checkout: moving from production to staging | |
82c3da0... HEAD@{1689}: merge staging: Fast forward | |
73f9e6a... HEAD@{1690}: checkout: moving from staging to production | |
82c3da0... HEAD@{1691}: merge designer: Fast forward | |
f61a225... HEAD@{1692}: checkout: moving from designer to staging | |
82c3da0... HEAD@{1693}: commit: fixed display_name method for header | |
f61a225... HEAD@{1694}: checkout: moving from staging to designer | |
f61a225... HEAD@{1695}: merge _edit_user: Fast forward | |
0caea33... HEAD@{1696}: checkout: moving from _edit_user to staging | |
f61a225... HEAD@{1697}: commit: updated user edit form | |
0caea33... HEAD@{1698}: checkout: moving from staging to _edit_user | |
0caea33... HEAD@{1699}: pull : Fast forward | |
feaf225... HEAD@{1700}: merge _jquery_ui_tabs: Merge made by recursive. | |
149e1b0... HEAD@{1701}: pull : Merge made by recursive. | |
9c5cf6a... HEAD@{1702}: checkout: moving from _jquery_ui_tabs to staging | |
7086d22... HEAD@{1703}: commit: deleted labeleing_form_helper and flexigrid stuff | |
ee66a4f... HEAD@{1704}: commit: Updated User Edit to user jquery tabs and moved to user controller | |
9c5cf6a... HEAD@{1705}: checkout: moving from staging to _jquery_ui_tabs | |
9c5cf6a... HEAD@{1706}: checkout: moving from _jquery_ui_tabs to staging | |
9c5cf6a... HEAD@{1707}: merge staging: Fast forward | |
6db1fb8... HEAD@{1708}: checkout: moving from staging to _jquery_ui_tabs | |
9c5cf6a... HEAD@{1709}: commit: updated login graphic | |
3ed4ea1... HEAD@{1710}: merge club_report_layout: Fast forward | |
6db1fb8... HEAD@{1711}: checkout: moving from club_report_layout to staging | |
3ed4ea1... HEAD@{1712}: commit: minor login tweaks | |
e0a7ba3... HEAD@{1713}: merge staging: Merge made by recursive. | |
d124071... HEAD@{1714}: commit: removed stupid less_routes.js | |
94f8e8e... HEAD@{1715}: checkout: moving from staging to club_report_layout | |
6db1fb8... HEAD@{1716}: checkout: moving from _jquery_ui_tabs to staging | |
6db1fb8... HEAD@{1717}: checkout: moving from staging to _jquery_ui_tabs | |
6db1fb8... HEAD@{1718}: checkout: moving from _jquery_ui_tabs to staging | |
6db1fb8... HEAD@{1719}: checkout: moving from staging to _jquery_ui_tabs | |
6db1fb8... HEAD@{1720}: commit: moved display_name to user.rb and created test | |
4362e52... HEAD@{1721}: commit: _header partial keeps coming back changed? | |
fae6730... HEAD@{1722}: commit: added preferences link in header | |
bc939ed... HEAD@{1723}: checkout: moving from find_user_edit_page to staging | |
07c6831... HEAD@{1724}: checkout: moving from staging to find_user_edit_page | |
bc939ed... HEAD@{1725}: checkout: moving from production to staging | |
73f9e6a... HEAD@{1726}: pull : Fast forward | |
8ff6670... HEAD@{1727}: checkout: moving from master to production | |
47b5184... HEAD@{1728}: pull : Fast forward | |
7664444... HEAD@{1729}: checkout: moving from staging to master | |
bc939ed... HEAD@{1730}: commit (merge): fixing db/schema.rb conflict | |
af69cd7... HEAD@{1731}: checkout: moving from find_user_edit_page to staging | |
07c6831... HEAD@{1732}: checkout: moving from staging to find_user_edit_page | |
af69cd7... HEAD@{1733}: commit: updated team tables | |
808db98... HEAD@{1734}: pull : Merge made by recursive. | |
2dbf5cc... HEAD@{1735}: checkout: moving from find_user_edit_page to staging | |
07c6831... HEAD@{1736}: commit: Added Preferences link | |
3fe0bb3... HEAD@{1737}: checkout: moving from _updated_login to find_user_edit_page | |
5dcf7f9... HEAD@{1738}: checkout: moving from find_user_edit_page to _updated_login | |
3fe0bb3... HEAD@{1739}: commit: added prefs link to header | |
b70a28c... HEAD@{1740}: commit: Removed public/javascripts/less_routes.js | |
2dbf5cc... HEAD@{1741}: checkout: moving from staging to find_user_edit_page | |
2dbf5cc... HEAD@{1742}: commit (merge): trying to commit | |
94f8e8e... HEAD@{1743}: checkout: moving from club_report_layout to staging | |
94f8e8e... HEAD@{1744}: checkout: moving from staging to club_report_layout | |
94f8e8e... HEAD@{1745}: checkout: moving from club_report_layout to staging | |
94f8e8e... HEAD@{1746}: checkout: moving from staging to club_report_layout | |
94f8e8e... HEAD@{1747}: checkout: moving from club_report_layout to staging | |
94f8e8e... HEAD@{1748}: checkout: moving from staging to club_report_layout | |
94f8e8e... HEAD@{1749}: checkout: moving from club_report_layout to staging | |
94f8e8e... HEAD@{1750}: checkout: moving from staging to club_report_layout | |
94f8e8e... HEAD@{1751}: checkout: moving from club_report_layout to staging | |
94f8e8e... HEAD@{1752}: checkout: moving from staging to club_report_layout | |
94f8e8e... HEAD@{1753}: checkout: moving from club_report_layout to staging | |
94f8e8e... HEAD@{1754}: checkout: moving from staging to club_report_layout | |
94f8e8e... HEAD@{1755}: commit (merge): fixed merge of _advisor_listing.haml | |
1671241... HEAD@{1756}: commit: working on advisor perf listing | |
7e0c5c8... HEAD@{1757}: commit (merge): pulled | |
51e0c25... HEAD@{1758}: commit: Removed less_routes.js | |
9e51b84... HEAD@{1759}: commit: added reports | |
6735334... HEAD@{1760}: checkout: moving from _static_page to staging | |
6735334... HEAD@{1761}: checkout: moving from staging to _static_page | |
6735334... HEAD@{1762}: pull : Merge made by recursive. | |
387b2d8... HEAD@{1763}: checkout: moving from _static_page to staging | |
387b2d8... HEAD@{1764}: checkout: moving from staging to _static_page | |
387b2d8... HEAD@{1765}: commit: cleaned up conflict files | |
291da20... HEAD@{1766}: commit (merge): fixing conflicts | |
aa1d0c9... HEAD@{1767}: commit: adding data - clubsumm July 08 | |
8ff6670... HEAD@{1768}: checkout: moving from production to staging | |
8ff6670... HEAD@{1769}: merge staging: Fast forward | |
ce29d3c... HEAD@{1770}: checkout: moving from staging to production | |
8ff6670... HEAD@{1771}: commit: removed debug code from authenticated_system.rb | |
c88ec39... HEAD@{1772}: pull : Merge made by recursive. | |
d75713d... HEAD@{1773}: commit: tweaks to http auth fix | |
cf8f0d2... HEAD@{1774}: merge _fixcapgun: Fast forward | |
4a16b5f... HEAD@{1775}: checkout: moving from _fixcapgun to staging | |
cf8f0d2... HEAD@{1776}: commit: Fixed IE http auth problem by adding is_browser? method and call in authenticated_system.rb | |
4a16b5f... HEAD@{1777}: checkout: moving from staging to _fixcapgun | |
4a16b5f... HEAD@{1778}: commit: changes to diagrams | |
ce29d3c... HEAD@{1779}: checkout: moving from production to staging | |
ce29d3c... HEAD@{1780}: merge staging: Fast forward | |
2c07888... HEAD@{1781}: checkout: moving from staging to production | |
ce29d3c... HEAD@{1782}: commit: login interface tweaks | |
2c07888... HEAD@{1783}: checkout: moving from production to staging | |
2c07888... HEAD@{1784}: merge staging: Fast forward | |
2c92a6a... HEAD@{1785}: checkout: moving from staging to production | |
2c07888... HEAD@{1786}: commit: minor login fixits" | |
2c92a6a... HEAD@{1787}: checkout: moving from production to staging | |
2c92a6a... HEAD@{1788}: checkout: moving from staging to production | |
2c92a6a... HEAD@{1789}: checkout: moving from _forgotpwd to staging | |
34763db... HEAD@{1790}: checkout: moving from staging to _forgotpwd | |
2c92a6a... HEAD@{1791}: checkout: moving from production to staging | |
2c92a6a... HEAD@{1792}: merge staging: Fast forward | |
9315df9... HEAD@{1793}: checkout: moving from staging to production | |
2c92a6a... HEAD@{1794}: commit: tweaks to login wording & reset screen | |
b89e317... HEAD@{1795}: commit: prep for staging rollout; merged in _forgotpwd | |
34763db... HEAD@{1796}: merge _forgotpwd: Fast forward | |
f2f29cc... HEAD@{1797}: checkout: moving from _forgotpwd to staging | |
34763db... HEAD@{1798}: commit: updated login screens & added forgot password functionality | |
f2f29cc... HEAD@{1799}: checkout: moving from staging to _forgotpwd | |
f2f29cc... HEAD@{1800}: commit: downloaded new subscriptions code in _Source | |
ac76eb8... HEAD@{1801}: pull : Merge made by recursive. | |
eb8a9ed... HEAD@{1802}: commit: added reports & planning docs | |
06a3b83... HEAD@{1803}: commit (merge): pulling down Matt' | |
6ac5477... HEAD@{1804}: commit: added capgun back to deploy | |
5dcf7f9... HEAD@{1805}: merge _updated_login: Fast forward | |
9315df9... HEAD@{1806}: checkout: moving from _updated_login to staging | |
5dcf7f9... HEAD@{1807}: commit: updated login screens | |
9315df9... HEAD@{1808}: checkout: moving from staging to _updated_login | |
9315df9... HEAD@{1809}: checkout: moving from production to staging | |
9315df9... HEAD@{1810}: merge staging: Fast forward | |
9ee74f6... HEAD@{1811}: checkout: moving from staging to production | |
9315df9... HEAD@{1812}: pull : Merge made by recursive. | |
dfb0e0d... HEAD@{1813}: commit: added in rails api docs | |
3cef84a... HEAD@{1814}: commit: unfreezed rails - trying to solve cap problem | |
e8f4c1f... HEAD@{1815}: commit: added planning doc | |
75daa97... HEAD@{1816}: merge freezerails: Fast forward | |
9ee74f6... HEAD@{1817}: checkout: moving from freezerails to staging | |
75daa97... HEAD@{1818}: commit: Freezing to the gems for Rails 2.1.0 | |
9ee74f6... HEAD@{1819}: checkout: moving from staging to freezerails | |
9ee74f6... HEAD@{1820}: merge production: Fast forward | |
e939451... HEAD@{1821}: checkout: moving from production to staging | |
9ee74f6... HEAD@{1822}: commit: Diff remnants removed in deploy files | |
e939451... HEAD@{1823}: merge staging: Fast forward | |
11afcfa... HEAD@{1824}: checkout: moving from staging to production | |
e939451... HEAD@{1825}: commit: Fixed html & css for advisor performance | |
2259396... HEAD@{1826}: checkout: moving from master to staging | |
7664444... HEAD@{1827}: checkout: moving from staging to master | |
2259396... HEAD@{1828}: checkout: moving from master to staging | |
7664444... HEAD@{1829}: checkout: moving from stagin to master | |
7664444... HEAD@{1830}: checkout: moving from master to stagin |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment