Christian Bruckmayer
84a26b8d02
Merge pull request #185 from ChrisBr/dashboard_head_boxes
...
Implements active user and submissions for global dashboard
2014-06-02 17:30:49 +02:00
Chrisbr
dd22ce3608
Implements active user and submissions for global dashboard
2014-06-02 14:57:53 +02:00
Gopesh Tulsyan
9f4325fd12
houndci fixes
2014-06-02 18:22:55 +05:30
Gopesh Tulsyan
f84f3b97a7
some basic tests for admin/users controller, fixed bug in admin/users controller for displaying users
...
Fixes by hounci violations
2014-06-02 18:22:55 +05:30
Christian Bruckmayer
7573a19240
Merge pull request #182 from ChrisBr/registration_dash
...
Implements registrations and since last login information
2014-06-02 14:39:10 +02:00
Chrisbr
b645b1a4ff
Implements registrations and last login information for dashboard
2014-06-02 14:22:51 +02:00
Christian Bruckmayer
6b31644012
Merge pull request #180 from ChrisBr/auto_color
...
Assigns a random color to conference
2014-06-02 14:19:25 +02:00
Christian Bruckmayer
03ccef63a0
Merge pull request #183 from ChrisBr/fix_social_events_test
...
Fix social events view test
2014-06-02 13:29:23 +02:00
Chrisbr
6c0452758d
Fix social events view test
2014-06-02 13:06:41 +02:00
Chrisbr
b9d01220ad
Assigns a random color to conference, track and difficulty level
2014-06-02 12:31:44 +02:00
Gopesh Tulsyan
c3d3440745
Merge pull request #150 from gopesht/callforapapers_compoenent
...
Callforapapers compoenent
2014-05-31 00:17:28 +05:30
Gopesh Tulsyan
b27a42a671
hounci fixes
2014-05-30 14:12:53 +05:30
Gopesh Tulsyan
87cd074e3c
Visibility check on the button modify-roles
2014-05-30 14:00:52 +05:30
Christian Bruckmayer
fa129de063
Merge pull request #173 from ChrisBr/new_dashboard
...
Implements event submissions over time chart
2014-05-30 10:23:23 +02:00
Chrisbr
40c61ed717
Implements event submissions over time chart
2014-05-30 10:10:47 +02:00
Gopesh Tulsyan
c567b0d0ab
Rebased and changes in countdown timer logic
2014-05-30 09:57:41 +05:30
Gopesh Tulsyan
25038a2c22
Call for papers component for splash page
2014-05-30 09:57:41 +05:30
James Mason
e8f751524b
Update a couple gem minor versions to agree with openSUSE packaged versions.
2014-05-29 20:31:03 +00: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
Gopesh Tulsyan
98e3784eba
Feature testing user specs
2014-05-28 23:51:04 +05:30
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
