Commit graph

398 commits

Author SHA1 Message Date
James Mason
ee655e09e8 Merge pull request #202 from gopesht/check_cfp
Check for cfp object before rendering partial
2014-06-12 10:14:06 -07:00
Gopesh Tulsyan
005bead45f Check for cfp object before rendering partial
Fixed horizontal overflow in splash due to cfp timer

Fixed condition for rendering cfp
2014-06-12 22:39:01 +05:30
Christian Bruckmayer
17427c88fe Merge pull request #221 from ChrisBr/bugfix_event
Bugfix events controller
2014-06-11 11:54:58 +02:00
Chrisbr
b25ae50908 Implements user and event state distribution 2014-06-11 09:31:13 +02:00
Chrisbr
611c8b6e49 Bugfix events controller 2014-06-10 14:39:49 +02:00
Christian Bruckmayer
069cc0eb4c Merge pull request #205 from ChrisBr/refactoring_event_state
Refactoring event states
2014-06-06 12:03:41 +02:00
Chrisbr
e5b588df81 Refactoring event states 2014-06-06 10:23:01 +02:00
Gopesh Tulsyan
fd20e67c76 Modified rendering for registration dates in splash 2014-06-05 12:04:15 +05:30
Gopesh Tulsyan
f87cd94cb5 Added method registration_dates_given? 2014-06-04 23:55:02 +05:30
James Mason
a95a03c7e5 Merge pull request #198 from gopesht/fix_cfp_dates_rendering
Added check before rendering cfp dates
2014-06-04 11:01:58 -07:00
Christian Bruckmayer
8cc77338b5 Merge pull request #197 from ChrisBr/remove_cfp_harddeadline
Removes column hard_deadline from call for papers
2014-06-04 18:36:54 +02:00
Gopesh Tulsyan
0fdd50169b Added check before rendering cfp dates 2014-06-04 21:04:53 +05:30
Chrisbr
c75471c0e4 Removes column hard_deadline from call for papers 2014-06-04 16:47:50 +02:00
Chrisbr
28293cb4c4 Implements recent items tabs and top submitter for dashboard 2014-06-04 16:11:33 +02:00
James Mason
25a1c116fd Merge pull request #191 from openSUSE/typo
s/shedule/schedule/
2014-06-03 11:34:22 -07:00
James Mason
4d43e944e1 Merge pull request #192 from openSUSE/begone-flash-padding
Remove additional whitespace around flash.
2014-06-03 11:34:11 -07:00
Christian Bruckmayer
ab21bb14de Merge pull request #190 from ChrisBr/step_by_step_list
Implements todo list for instance dashboard
2014-06-03 19:47:28 +02:00
James Mason
3075429f6b Remove additional whitespace around flash.
Looking at the screenshots, it just seems excessive.
2014-06-03 10:39:42 -07:00
James Mason
e2fb292b40 s/shedule/schedule/ 2014-06-03 10:36:47 -07:00
James Mason
70212ebbcf Merge pull request #136 from gopesht/feature_testing
Feature testing
2014-06-03 07:54:41 -07:00
James Mason
642cb06dc2 Merge pull request #114 from gopesht/testing
some basic tests and fixed bug to display users
2014-06-03 07:53:23 -07:00
Chrisbr
65a73f876a Implements todo list for instance dashboard 2014-06-03 16:27:10 +02:00
Chrisbr
54ac8a8fb7 Bugfix conference#calculate_items_per_week 2014-06-03 14:00:33 +02:00
Chrisbr
dd22ce3608 Implements active user and submissions for global dashboard 2014-06-02 14:57:53 +02:00
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
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
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
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
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
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
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
Gopesh Tulsyan
f825599433 Conditional rendering of splash navbar 2014-05-29 11:24:54 -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
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
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
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