Chrisbr
6c0452758d
Fix social events view test
2014-06-02 13:06:41 +02:00
James Mason
9e39fedf05
Merge pull request #177 from gopesht/add_tickets_to_registration_segment
...
Add tickets to registration segment
2014-05-29 13:18:19 -07:00
Gopesh Tulsyan
9de6678f95
updated db/schema.rb
2014-05-30 01:21:17 +05:30
Gopesh Tulsyan
2d87610a97
Fixed view specs, passing
2014-05-30 00:54:45 +05:30
James Mason
7311b0c40e
Merge pull request #170 from gopesht/add_tracks_to_program_component
...
Added tracks to program component
2014-05-29 12:07:09 -07:00
Gopesh Tulsyan
e2fd1bbd69
Add tickets to registration segment
2014-05-30 00:31:12 +05:30
Gopesh Tulsyan
abfb0884a1
Added registration segment to display description, period
...
Controller test for Conference#show
houndci fixes
Rebased with single entry for navigation branding
Conditional rendering of splash navbar
2014-05-30 00:30:09 +05:30
Gopesh Tulsyan
1e802bc3c6
Added description to conference and program segment to splash
...
Added tracks to program component
Rebased and updated the new navigation for splash
2014-05-30 00:20:44 +05:30
James Mason
25a56097c5
Merge pull request #168 from gopesht/program_segment
...
Added description to conference and program segment to splash
2014-05-29 11:38:11 -07:00
Gopesh Tulsyan
b3d719829e
Added description to conference and program segment to splash
...
removed id from program partial
2014-05-29 23:57:35 +05:30
James Mason
88c92727c5
Merge pull request #140 from openSUSE/factoria
...
Progress on factories
2014-05-29 11:26:30 -07:00
Gopesh Tulsyan
f825599433
Conditional rendering of splash navbar
2014-05-29 11:24:54 -07:00
James Mason
387f4ecd39
Merge pull request #175 from bear454/yield-nav-listitems
...
Use a single entry for navigation branding:
2014-05-29 11:22:08 -07:00
James Mason
b023459600
Use a single entry for navigation branding:
...
Allow a view to override the brand (esp. for conference splash pages),
Use the app name link for the admin control panel,
use the conference short title for end user content within a conference,
fall back to the app name link.
Visually, there are two substantial changes:
(1) the conference title (or short title) serves as the brand when viewing
conference content;
(2) the short title isn't shown redundantly on the navbar and the top of the
sidebar when editing a conf.
2014-05-28 13:52:15 -07:00
James Mason
c6f2b4f641
Merge pull request #169 from gopesht/fix_controller_test_for_splash
...
Controller test for Conference#show
2014-05-28 09:40:28 -07:00
James Mason
af8daa3b1a
Merge pull request #167 from gopesht/conference_date_helper
...
Modified date helper
2014-05-28 09:30:00 -07:00
Christian Bruckmayer
b6538cddb2
Merge pull request #171 from ChrisBr/bugfix_sidebar
...
Removes new conference link form loop
2014-05-28 14:25:15 +02:00
Christian Bruckmayer
6155286b24
Merge pull request #172 from ChrisBr/add_color_to_conference
...
Adds color attribute to model
2014-05-28 14:24:56 +02:00
Gopesh Tulsyan
1183ee6da9
Added method to wrap the date helper to recieve two dates instead of a object
2014-05-28 17:18:54 +05:30
Chrisbr
dc080705ae
Adds color attribute to conference
2014-05-28 13:40:58 +02:00
Chrisbr
d1d75e97a4
Removes new conference link form loop
2014-05-28 13:31:42 +02:00
Gopesh Tulsyan
89e759daf6
Controller test for Conference#show
2014-05-28 15:06:08 +05:30
James Mason
cc3ff4837f
Create event factory, and required association factories
2014-05-27 12:10:21 -07:00
Christian Bruckmayer
a33e930111
Merge pull request #162 from ChrisBr/removes_header
...
Renmanes Conference edit link to Settings in admin menu
2014-05-26 11:41:11 +02:00
Christian Bruckmayer
989848ce88
Merge pull request #153 from ChrisBr/redirect_admin
...
Redirects to admin/index after admin login
2014-05-26 11:40:54 +02:00
Chrisbr
ff49443e9a
Redirects to admin/index after admin login
2014-05-23 17:05:19 +02:00
Chrisbr
cd83cb2f8f
Renmanes Conference edit link to Settings in admin menu
2014-05-23 16:49:34 +02:00
Christian Bruckmayer
643b8b173a
Merge pull request #161 from ChrisBr/bugfix_admin_menu
...
Shows dropdown on load if path correspondent to link
2014-05-23 16:29:48 +02:00
Chrisbr
61606d3932
Shows dropdown on load if path correspondent to link
2014-05-23 15:32:07 +02:00
Christian Bruckmayer
b97b48b1eb
Merge pull request #156 from ChrisBr/remove_admin_dd
...
Removes admin from dropdown
2014-05-23 15:07:16 +02:00
Christian Bruckmayer
e9e3dad431
Merge pull request #155 from ChrisBr/dd_admin
...
Dropdown shows now context
2014-05-23 15:07:08 +02:00
Christian Bruckmayer
d52678e348
Merge pull request #154 from ChrisBr/new_admin_rb
...
Moves conference show #action to #edit action
2014-05-23 14:38:39 +02:00
Chrisbr
a9814146ff
Removes admin from dropdown
2014-05-23 14:30:59 +02:00
Chrisbr
cd8e8a5c7e
Dropdown shows now context
2014-05-23 14:19:57 +02:00
Chrisbr
ab4d3021a2
Moves conference show #action to #edit action
2014-05-23 13:01:23 +02:00
Christian Bruckmayer
738098e4a9
Merge pull request #151 from ChrisBr/new_admin_rb
...
New admin menu
2014-05-23 12:43:52 +02:00
Chrisbr
89fb059aaa
New admin menu
2014-05-22 18:19:07 +02:00
Gopesh Tulsyan
29cd9d0132
Merge pull request #144 from gopesht/view_specs
...
View specs, added factories.
2014-05-21 16:33:16 +05:30
Gopesh Tulsyan
7a19fefd53
houndci fixes
2014-05-21 16:20:02 +05:30
Gopesh Tulsyan
d1e9bd06a6
View specs, added factories, fixed bugs
2014-05-21 16:20:02 +05:30
Gopesh Tulsyan
322ddd1501
Merge pull request #148 from gopesht/splash_page
...
Create view for splash page from existing routes
2014-05-20 19:39:23 +05:30
Stella Rouzi
2e7eb7d367
Merge pull request #137 from differentreality/resources_registrations
...
resources :registrations
2014-05-19 22:27:47 +03:00
Gopesh Tulsyan
03138fd40d
fixes by houndci
2014-05-19 21:25:42 +05:30
Gopesh Tulsyan
7a5f47257a
Create view for splash page from existing routes
2014-05-19 21:21:06 +05:30
Christian Bruckmayer
e11ad83b32
Merge pull request #147 from ChrisBr/sp_registration
...
Implements strong parameters for registration controller
2014-05-19 13:38:41 +02:00
Christian Bruckmayer
7cf139cc9b
Merge pull request #145 from ChrisBr/remove_gravater_alt
...
Removes gravater alt text
2014-05-19 13:16:26 +02:00
Chrisbr
074ca56cb2
Implements strong parameters for registration controller
2014-05-19 13:01:07 +02:00
Chrisbr
8e0b9193e2
Removes gravater alt text
2014-05-19 11:20:11 +02:00
Christian Bruckmayer
c78a09cc53
Merge pull request #143 from ChrisBr/bugfix_account_edit
...
Implements devise strong parameters for registration
2014-05-19 11:18:00 +02:00
Christian Bruckmayer
de0ada0bd1
Merge pull request #142 from ChrisBr/flash
...
fix flash css classes
2014-05-19 10:58:22 +02:00
