Commit graph

  • a0aa523122 houndci fixes Gopesh Tulsyan 2014-05-26 15:43:19 +05:30
  • a33e930111 Merge pull request #162 from ChrisBr/removes_header Christian Bruckmayer 2014-05-26 11:41:11 +02:00
  • 989848ce88 Merge pull request #153 from ChrisBr/redirect_admin Christian Bruckmayer 2014-05-26 11:40:54 +02:00
  • c67700e0ae Minor fixes Gopesh Tulsyan 2014-05-26 15:01:35 +05:30
  • ea119a8158 Sponsor dashboard added, with sponsor component for splash page Gopesh Tulsyan 2014-05-26 13:51:03 +05:30
  • 98030936fa houndci fixes Gopesh Tulsyan 2014-05-23 21:40:54 +05:30
  • 6b075370b5 houndci fixes Gopesh Tulsyan 2014-05-23 21:38:59 +05:30
  • 3e349911c3 houndci fixes Gopesh Tulsyan 2014-05-23 21:38:40 +05:30
  • 5c9e0a279e Registration Component Gopesh Tulsyan 2014-05-23 21:21:11 +05:30
  • ff49443e9a Redirects to admin/index after admin login Chrisbr 2014-05-23 17:05:19 +02:00
  • cd83cb2f8f Renmanes Conference edit link to Settings in admin menu Chrisbr 2014-05-23 16:48:49 +02:00
  • 643b8b173a Merge pull request #161 from ChrisBr/bugfix_admin_menu Christian Bruckmayer 2014-05-23 16:29:48 +02:00
  • 61606d3932 Shows dropdown on load if path correspondent to link Chrisbr 2014-05-23 15:31:58 +02:00
  • b97b48b1eb Merge pull request #156 from ChrisBr/remove_admin_dd Christian Bruckmayer 2014-05-23 15:07:16 +02:00
  • e9e3dad431 Merge pull request #155 from ChrisBr/dd_admin Christian Bruckmayer 2014-05-23 15:07:08 +02:00
  • d52678e348 Merge pull request #154 from ChrisBr/new_admin_rb Christian Bruckmayer 2014-05-23 14:38:39 +02:00
  • a9814146ff Removes admin from dropdown Chrisbr 2014-05-23 14:30:59 +02:00
  • cd8e8a5c7e Dropdown shows now context Chrisbr 2014-05-23 14:19:57 +02:00
  • ab4d3021a2 Moves conference show #action to #edit action Chrisbr 2014-05-23 13:01:23 +02:00
  • 738098e4a9 Merge pull request #151 from ChrisBr/new_admin_rb Christian Bruckmayer 2014-05-23 12:43:52 +02:00
  • 89fb059aaa New admin menu Chrisbr 2014-05-22 18:19:07 +02:00
  • 29cd9d0132 Merge pull request #144 from gopesht/view_specs Gopesh Tulsyan 2014-05-21 16:33:16 +05:30
  • 7a19fefd53 houndci fixes Gopesh Tulsyan 2014-05-19 12:49:04 +05:30
  • d1e9bd06a6 View specs, added factories, fixed bugs Gopesh Tulsyan 2014-05-19 12:24:48 +05:30
  • 322ddd1501 Merge pull request #148 from gopesht/splash_page Gopesh Tulsyan 2014-05-20 19:39:23 +05:30
  • 2e7eb7d367 Merge pull request #137 from differentreality/resources_registrations Stella Rouzi 2014-05-19 22:27:47 +03:00
  • 03138fd40d fixes by houndci Gopesh Tulsyan 2014-05-19 21:25:42 +05:30
  • 7a5f47257a Create view for splash page from existing routes Gopesh Tulsyan 2014-05-19 21:21:06 +05:30
  • 7e485e5d4b Merge 6b65559ebd into e11ad83b32 Gopesh Tulsyan 2014-05-19 15:46:23 +00:00
  • 830193bdca Merge e49906f342 into e11ad83b32 Gopesh Tulsyan 2014-05-19 15:03:52 +00:00
  • e49906f342 Removed header links from conference#show Gopesh Tulsyan 2014-05-19 20:33:33 +05:30
  • 894ca542c0 Removed header links Gopesh Tulsyan 2014-05-19 20:33:02 +05:30
  • efbab7f159 Merge 0257c73176 into e11ad83b32 Stella Rouzi 2014-05-19 11:38:43 +00:00
  • e11ad83b32 Merge pull request #147 from ChrisBr/sp_registration Christian Bruckmayer 2014-05-19 13:38:41 +02:00
  • 7cf139cc9b Merge pull request #145 from ChrisBr/remove_gravater_alt Christian Bruckmayer 2014-05-19 13:16:26 +02:00
  • 074ca56cb2 Implements strong parameters for registration controller Chrisbr 2014-05-19 13:01:07 +02:00
  • 0257c73176 translation, first approach Stella 2014-05-19 13:17:32 +03:00
  • 8e0b9193e2 Removes gravater alt text Chrisbr 2014-05-19 11:20:11 +02:00
  • c78a09cc53 Merge pull request #143 from ChrisBr/bugfix_account_edit Christian Bruckmayer 2014-05-19 11:18:00 +02:00
  • de0ada0bd1 Merge pull request #142 from ChrisBr/flash Christian Bruckmayer 2014-05-19 10:58:22 +02:00
  • aa539b2cf0 single quotes Gopesh Tulsyan 2014-05-17 08:31:07 +05:30
  • de3701fce7 single quotes Gopesh Tulsyan 2014-05-17 08:30:56 +05:30
  • 443ee19760 Added ids to links in conference#show Gopesh Tulsyan 2014-05-17 08:29:33 +05:30
  • 04c00e4b0c Implements devise strong parameters for registration Chrisbr 2014-05-16 20:31:41 +02:00
  • 6ac8f6fd7a fix flash css classes Chrisbr 2014-05-16 19:52:41 +02:00
  • b92d3be53b Merge 0024c48454 into 7a209e10a7 Christian Bruckmayer 2014-05-16 17:42:33 +00:00
  • 0024c48454 Implements devise strong parameters for account update Chrisbr 2014-05-16 19:42:23 +02:00
  • 2d01bcad17 fixes done Gopesh Tulsyan 2014-05-16 21:01:03 +05:30
  • 7a209e10a7 Merge pull request #138 from differentreality/houndci Stella Rouzi 2014-05-16 15:59:49 +03:00
  • 6b65559ebd fixes by houndci Gopesh Tulsyan 2014-05-16 12:50:50 +05:30
  • 85cc4413bd fixes by houndci Gopesh Tulsyan 2014-05-16 12:46:50 +05:30
  • 07ac2baa68 fixes by houndci Gopesh Tulsyan 2014-05-16 12:44:41 +05:30
  • 1f3e9a39c8 fixes by houndci Gopesh Tulsyan 2014-05-16 12:23:16 +05:30
  • 8c69d0f651 fixes by houndci Gopesh Tulsyan 2014-05-16 12:14:08 +05:30
  • cdaa9ba41a File getting uploaded and stored in public folder Gopesh Tulsyan 2014-05-16 12:10:32 +05:30
  • 7d921929a0 configure houndci to allow lines up to 100 chars Stella Rouzi 2014-05-15 21:25:29 +03:00
  • e921e4da22 new Ruby 1.9 hash syntax Stella Rouzi 2014-05-15 21:04:08 +03:00
  • 544146e7a9 houndci fixes Stella Rouzi 2014-05-15 20:55:27 +03:00
  • 7490316a5b resources :registrations Stella Rouzi 2014-05-15 20:30:01 +03:00
  • 8edeccb52b Merge 1001d58824 into 045e434f3d Stella Rouzi 2014-05-15 13:30:07 +00:00
  • 045e434f3d Merge pull request #134 from gopesht/fix_admin_dashboard_modal Gopesh Tulsyan 2014-05-15 19:00:06 +05:30
  • bf19cec236 Merge pull request #135 from ChrisBr/update_nokogiri Christian Bruckmayer 2014-05-15 14:38:37 +02:00
  • baf9e4f2fd Merge pull request #132 from ChrisBr/difficulty_levels_spec Christian Bruckmayer 2014-05-15 14:20:16 +02:00
  • 6cc9e16c73 Merge pull request #131 from ChrisBr/event_types_spec Christian Bruckmayer 2014-05-15 14:20:05 +02:00
  • 799fba1321 Updates nokogiri Chrisbr 2014-05-15 14:18:33 +02:00
  • 86b007d60e Fixed admin/users modal display Gopesh Tulsyan 2014-05-15 17:47:34 +05:30
  • 7c7cbc0310 Merge pull request #130 from ChrisBr/tracks_spec Christian Bruckmayer 2014-05-15 13:49:04 +02:00
  • 9e1da20f79 Merge pull request #129 from ChrisBr/rooms_spec Christian Bruckmayer 2014-05-15 13:48:45 +02:00
  • cbe1f8b96d Implements difficulty level feature test Chrisbr 2014-05-15 13:23:14 +02:00
  • b06b64b3dd Merge pull request #133 from ChrisBr/supporter_levels_spec Christian Bruckmayer 2014-05-15 13:22:15 +02:00
  • b282ce229c Implements event types feature test Chrisbr 2014-05-15 13:21:34 +02:00
  • 675f5e7895 Implements tracks feature test Chrisbr 2014-05-15 13:20:17 +02:00
  • 0f32960eed Adds rooms feature test Chrisbr 2014-05-15 13:18:31 +02:00
  • 5f174762b4 Merge pull request #127 from ChrisBr/email_test Christian Bruckmayer 2014-05-15 13:16:38 +02:00
  • c9b65e9a5d Merge pull request #122 from ChrisBr/conference_alert Christian Bruckmayer 2014-05-15 13:16:29 +02:00
  • 60ca821419 Merge pull request #128 from ChrisBr/refactor_conf_spec Christian Bruckmayer 2014-05-15 13:16:16 +02:00
  • dceb5d37e5 Implements supporter levels feature test Chrisbr 2014-05-15 12:47:54 +02:00
  • 0caa62cacd Merge pull request #126 from ChrisBr/delete_cfp_rating_desc Christian Bruckmayer 2014-05-15 11:56:45 +02:00
  • c8ee5b0f77 Merge pull request #125 from ChrisBr/cfp_test Christian Bruckmayer 2014-05-15 11:33:19 +02:00
  • d284455583 Merge pull request #124 from ChrisBr/fix_tests Christian Bruckmayer 2014-05-15 11:33:08 +02:00
  • d498178513 fixes by hound ci Gopesh Tulsyan 2014-05-15 11:05:18 +05:30
  • 4778564e3e fixes done as suggested Gopesh Tulsyan 2014-05-15 11:03:28 +05:30
  • b533b1594f Refactoring conference feature test Chrisbr 2014-05-14 17:27:42 +02:00
  • fcee4a0991 Implements email feature test Chrisbr 2014-05-14 17:08:46 +02:00
  • 17307736e8 Removes rating desc column from cfp Chrisbr 2014-05-14 16:37:19 +02:00
  • cef4a7c49d Implements cfp feature test Chrisbr 2014-05-14 15:56:22 +02:00
  • 3d534ff7ba Refactoring alert message for conference controller Chrisbr 2014-05-14 11:47:54 +02:00
  • 77dc4b2a93 Extended porposal feature test Chrisbr 2014-05-14 13:52:54 +02:00
  • 1001d58824 fix modal dialog Stella Rouzi 2014-05-14 09:19:45 +03:00
  • 379211943f change modal in view according to bootstrap3 and query in controller Stella Rouzi 2014-04-28 12:22:43 +03:00
  • a8c9c2f2d4 Merge pull request #123 from ChrisBr/fix_tests Christian Bruckmayer 2014-05-14 13:33:50 +02:00
  • f485f4ce57 fix failing tests Chrisbr 2014-05-14 13:18:19 +02:00
  • f6088e9abe Merge pull request #117 from hennevogel/callforpapers Henne Vogelsang 2014-05-14 11:29:53 +02:00
  • f01093196f Merge pull request #121 from ChrisBr/fix_dropdown Christian Bruckmayer 2014-05-14 11:20:21 +02:00
  • edab06b253 Fix dropdown on event index page Chrisbr 2014-05-14 10:38:36 +02:00
  • 94078f844b Fixes by houndci Gopesh Tulsyan 2014-05-14 13:29:13 +05:30
  • 1c152c87ab Create Splash Page using existing routes as Conference#Show Gopesh Tulsyan 2014-05-14 13:16:08 +05:30
  • 5f6ab4f7ee Merge pull request #119 from ChrisBr/event_workflow_test Christian Bruckmayer 2014-05-13 17:57:06 +02:00
  • c3228f701a Merge pull request #116 from gopesht/refactor_home_page Gopesh Tulsyan 2014-05-13 21:17:18 +05:30
  • 12fd3b7d5a Fix id in forloop Chrisbr 2014-05-13 16:45:43 +02:00