gistfile1.txt

~/www/railsmachine/statusroom(edge) > git br -v -a
  646424-login-form-styling                 96abeb6 added image submit button to login screen
  650902-top-header-fixes                   afa2fcb top header fixes
  651035-cleanup-footer                     60742f7 made footer match header. changed link hover color to match max's comps
  651039-style-mega-drop-downs              e1b01c5 cleaning up _roomy.sass and making menu links blue
  651576-improve-megadropdown-design        1690c49 Merge branch 'edge' of [email protected]:c3mediagroup/statusroom into edge
  656018-add-sla-acceptance                 7c05aed added new header logo and text to account setup screen
  657838-revise-menu-order                  f7d58c9 revise menu order and shadow. removed staff test
  657871-cleanup-haml-deprecation-warnings  b0967b2 fixed haml quoted strings in roomy.saas
  659625-write-full-sla                     15b1463 added temp sla to docs
  688063-adjust-team-edit-picker            24181c5 adjusted edit team layout
  _SetupStateScreens                        5fccb1b changed required gems to :lib => false when they are only required for testing
  _addCompanySubMenu                        07fdb3f removed default param from menuize submenus. broken.
  _addjqGrid                                9beaf8e adding jqGrid test
  _advisorsearchStyling                     f4aa8cb comment out user.year error
  _customErrorPages                         d2cf0f1 disable local_request.true
  _installZenDesk                           ab8a237 hooked up zendesk support link/overlay
  _mbMenu                                   3ff409b Merge branch 'master' of [email protected]:c3mediagroup/statusroom
  _merge-koombea_edge-and-edge              ee54eaf merged koombea_edge and edge
  _robert_attempt_koombea_edge_to_matt_edge 6195e06 Merge branch 'edge' of [email protected]:c3mediagroup/statusroom into edge
  _rpfixes20090512                          5c0243e tweaks to account/setup
  _rptemp20090511                           5c5394d added ImportEAP instructions
  _rptemp20090512                           44be5d3 updated favicon & docs
  _rptesting                                79a9fc9 changed login input font
  designer                                  36a9eb8 merging to designer branch
* edge                                      5aa6f97 Merge branch 'edge' of [email protected]:c3mediagroup/statusroom into edge
  koombea                                   ba060bc Merge with edge branch
  koombea_edge                              5eede3d Fixed content alignment
  master                                    013e7b0 merged local master from matt's edge to the origin master
  pacificadvisors                           b8e50f5 Merge branch 'edge' into staging
  peachtreeplanning                         45b8087 setup for peachtreeplanning
  production                                b0967b2 fixed haml quoted strings in roomy.saas
  robert                                    ee54eaf merged koombea_edge and edge
  staging                                   b661be3 Merge branch 'edge' into staging
  upstream                                  5ae7d0a checking on older upstream
  upstream_rp1                              937e6f3 Merge branch 'upstream' of [email protected]:c3mediagroup/statusroom into upstream
  wdg                                       63bf79d added wdg logo
  x_DemoClubSummFix                         c47fcb3 advisor clubsumm
  x_DemoFixes                               817037b working on units
  x_FinalDemoFixes                          b7c5277 dashboard fixes
  x_FramedLayout                            86a9ce9 trying to get compass playing nice with latest sass
  x_advisorChartUpgrade                     f59107a start of admin user list back in
  x_advisorView                             5c2618e table css work & menu changes
  x_checkPwd                                272197f Merge branch 'master' of [email protected]:c3mediagroup/statusroom
  x_circar                                  a360816 The raw text during import would all be saved to a text column in the db (for that EAP/advisor)
  x_dashboardWork                           3a57c08 adding accordions galore
  x_dashboardWork2                          c8e1e3f new layout, header, footer, side & css work
  x_dashboardWork3                          7e8ac7c added back in head tabs nav
  x_dashboardWork4                          9378a5b dashboard tweaks for Matt
  x_dashboardWork5                          93fd91a prep for KK's NY presentation
  x_fixClubSummAjaxDisplay                  57e3111 tweaks to styles for IE view of accordions. Switched back to fixe width on the main content panel to solve the issues.
  x_fixEAPDetailPage                        81c8a2c brought over EAP detail fix from robert branch
  x_fixNotesforRobertMerge                  056695a merging robert w/ master
  x_fixlegend                               496a0d3 fixed legend on company combined performance
  x_rfpdf_work                              e74553b added production mysql backups
  x_sassIntegration                         1b35f05 Fixed broken migration by adding an empty PolicyNote class definition.  Also added the migration to remove the now defunct policy_notes table.
  origin/HEAD                               806e023 Adding Product.create_defaults to Statusroom.bootstrap
  origin/circar                             2f694f8 Merge branch 'circar' of [email protected]:c3mediagroup/statusroom into circar
  origin/designer                           36a9eb8 merging to designer branch
  origin/development_c3                     ab0934e small fix for birders
  origin/development_koombea                bfc1d91 Added styles to advisors page
  origin/edge                               1cd956e Merged koombea_edge into edge
  origin/koombea                            c2ed93f Fixed ff min version and msg.
  origin/koombea_edge                       5eede3d Fixed content alignment
  origin/library                            89de98d update urls in sla_temp
  origin/master                             806e023 Adding Product.create_defaults to Statusroom.bootstrap
  origin/pacificadvisors                    806e023 Adding Product.create_defaults to Statusroom.bootstrap
  origin/peachtreeplanning                  4c5eff3 fixing database.yml - user is username
  origin/production                         2944027 fix for mega menu hover in IE8
  origin/robert                             5c0243e tweaks to account/setup
  origin/stable                             5eede3d Fixed content alignment
  origin/stable_edge                        5eede3d Fixed content alignment
  origin/staging                            421adff Merge branch 'edge' into staging
  origin/upstream                           5ae7d0a checking on older upstream
  origin/wdg                                63bf79d added wdg logo
~/www/railsmachine/statusroom(edge) >