gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1286 commits 2 branches 2 tags 50 MiB
Commit graph

110 commits

Author SHA1 Message Date
Rob Smith
24db130c92 Allow a proposal to be created with a Subtitle and Difficulty Level. 
When a proposal is being submitted, we want to allow the submitter to
fill out the form once with all the required data. This change unifies
the forms for both editing and creating proposals. This allows us to
ensure that features are added in parallel to both workflows.

We also reduce the number of duplicate lines by removing duplicates
from the new.html.haml file.

We also increase the column size in css to have both pages show the
same width forms.
 2015-06-14 01:57:52 -07:00
Stella Rouzi
e6bb168c5e Refactoring of proposal workflow. Fixes #215 2015-04-16 18:37:31 +03:00
Henne Vogelsang
9e0c871494 Fix rubocop warnings and User index bug 2015-04-15 10:23:24 +02:00
Henne Vogelsang
6a5cccbaad Last stage of refactoring of the ability model and spec 2015-04-14 17:33:59 +02:00
chrisbr
ac1d9fd329 First stage of refactoring of the ability model and spec 2015-04-14 08:31:52 +02:00
Henne Vogelsang
0ce4aa0a49 Fix the ability spec 
* Get rid of the volunteer coordinator role, we don't use it currently
* Test the ability with users that exclusively have a single role
 2015-03-13 00:43:09 +01:00
Gopesh Tulsyan
dc05cc83ac Merge pull request #580 from openSUSE/refactor_email_settings 
Refactor Admin Email Settings Form
 2015-01-22 00:49:19 +05:30
Stella
80fbc144ac remove user deletion until further notice 2015-01-18 22:01:05 +02:00
Gopesh Tulsyan
6afb1ee4a9 Fixing tests for email settings template 
Refactor

Refactor
 2015-01-17 21:17:39 +05:30
Henne Vogelsang
b65a33f047 Merge pull request #560 from hennevogel/feature-user-view 
Various small UI fixes
 2014-12-09 15:52:44 +01:00
Henne Vogelsang
e9456be31a Merge pull request #554 from differentreality/cfp_dates 
cfp validations
 2014-12-05 16:25:10 +01:00
Henne Vogelsang
d13efa5f52 Various small fixes for the participant UI 2014-12-05 16:04:34 +01:00
Stella
99d50ea91e campaign spec 2014-11-30 18:34:39 +02:00
Stella
5fb7e5cbef an error spec 2014-11-30 17:11:55 +02:00
Stella
6e026746a9 validate cfp start_date before end_date and end_date before conference.end_date 2014-11-29 20:00:26 +02:00
Henne Vogelsang
28063129c7 Implement consistent admin interface 
* Consistent route/model/controller/view layout
* Get rid of unused photos, speakers, dietchoices, social_events controllers
* Drop unused :public from Rooms and :description from CallForPapers
 2014-11-25 10:47:18 +01:00
Henne Vogelsang
cb227a0afc Another round of splash design 
* Add map to splash
* Reverse venue<->conference relation
* Split venue address into fields
* Don't go through venue for lodgings anymore
 2014-11-20 15:39:26 +01:00
Henne Vogelsang
30e8ab856c Get rid of the splashpage banner photo and "descriptions" 2014-11-20 15:39:26 +01:00
Henne Vogelsang
f2cdea4f1a Integrate the splash page into the general layout 
* Cleanup the CSS
* Fix more views then you have fingers and toes
* Introduce position(weight) for sponsor levels
* Fix bootstrap/datatable integration
 2014-11-17 13:58:27 +01:00
Christian Bruckmayer
97bf86454e Merge pull request #518 from ChrisBr/lodgings 
Refactoring admin lodging menu
 2014-11-12 12:47:30 +01:00
Christian Bruckmayer
5a80adaee5 Merge pull request #539 from ChrisBr/venue 
Refactoring venue
 2014-11-12 12:47:14 +01:00
chrisbr
9d08f52636 Refactoring venue 2014-11-12 12:12:57 +01:00
Christian Bruckmayer
56747fc118 Merge pull request #515 from ChrisBr/rooms 
Refactoring admin room menu
 2014-11-12 12:01:10 +01:00
chrisbr
580c6c6ed9 Refactoring lodgings 2014-11-12 12:00:03 +01:00
chrisbr
6a373b5f6c Refactoring rooms 2014-11-12 11:37:28 +01:00
Chrisbr
9376fe57e3 Moves sponsor email attribute from conference to contact 2014-11-12 11:16:22 +01:00
Chrisbr
be68877f1a Implements new admin menu structure #304 
close #305
 2014-09-30 12:57:56 +02:00
Stella Rouzi
46aed52c85 commercials 2014-09-03 00:18:45 +03:00
Stella Rouzi
bb731aec00 tickets controller fix message 2014-09-02 23:28:23 +03:00
Stella Rouzi
da061b3902 exclude config/ from rubocop styling, more style fixes 2014-09-02 21:45:07 +03:00
Stella Rouzi
b7c45718d8 apply StringLiterals cop (remove double quotes, unless there is string interpolation) 2014-09-02 21:45:07 +03:00
Chrisbr
fedb0753bf Extracted Splashpage from Conference 
#418
 2014-08-31 22:59:42 +02:00
Chrisbr
5f8a8ac6d9 Refactoring Tickets 
- Tickets now independent from registration
- Implemented money gem
#419
 2014-08-28 15:21:05 +02:00
Chrisbr
d21e19b977 Big refactoring of registration 
- Added datatable gem
- Addaed datatable to events, users (#422), registrations
 2014-08-22 15:08:54 +02:00
James Mason
b5fe3bfdcd Merge pull request #474 from bear454/minor_fixes 
Minor fixes
 2014-08-19 14:24:21 -07:00
James Mason
89c77fa33b trigger click instead of .click 2014-08-19 10:09:24 -07:00
James Mason
818fd96418 Adding a network delay on subsequent action in proposal spec. 
Without this, I get consistent failures, and others experience intermmitent failures, on this spec.
 2014-08-19 08:49:51 -07:00
Chrisbr
ed55e2bf3a Introduces new RegistrationPeriod Object for Conference 
#416
 2014-08-18 14:33:02 +02:00
Chrisbr
d0e9805456 Removes dulplicate conference update action and moves methods out of private area 2014-08-15 16:06:02 +02:00
Stella Rouzi
7d35fc2857 fix test and add test for roles view 2014-08-14 19:58:50 +03:00
Stella Rouzi
911143c006 fix in admin menu and rework menu tests 2014-08-14 16:46:34 +03:00
Stella Rouzi
ba6643a394 fix sponsor test, fixes from rebase, remove admin area check from application controller, fix admin menu layout 2014-08-14 11:37:30 +03:00
Stella Rouzi
beb88b848d changes from comments, fix commercials failing test 2014-08-13 22:53:15 +03:00
Stella Rouzi
aeb28833f1 fixes 2014-08-13 22:53:14 +03:00
Stella Rouzi
f5081813d9 fix from rebase 
Conflicts:
	app/views/layouts/_admin_sidebar.html.haml
 2014-08-13 22:53:14 +03:00
Stella Rouzi
71dfb3b7e4 fix conflicts 2014-08-13 22:53:13 +03:00
Stella Rouzi
e2fb434dc7 Implement role authorization 2014-08-13 22:53:13 +03:00
Gopesh Tulsyan
d4074b798e Merge pull request #377 from gopesht/add_email_settings_to_user_accounts 
Add email settings to user accounts
 2014-08-13 09:22:34 +05:30
Gopesh Tulsyan
a39f4cf0dd Subscription on Registration, Independent Subscription without registration 2014-08-12 16:47:36 +05:30
Chrisbr
22cc5e4f14 Extracting Photos form Conference edit form 
close #384
 2014-08-12 08:38:51 +02:00