Aditya Prakash
e6da13ed12
Merge ccc28cdc90 into 3b0eb1c407
2016-02-25 14:20:26 +00:00
Aditya Prakash
ccc28cdc90
Add test for QuestionsController
...
new method was dead code.
@questions_conference was dead variable.
assignment of question's foreign key was unnecessary.
fixes in type of flash messages.
2016-02-25 12:42:55 +05:30
Stella Rouzi
f567187d45
Add validations for registration_period
2016-02-23 12:57:45 +02:00
Henne Vogelsang
e2fb83146a
Merge pull request #768 from hennevogel/rubocop
...
Update rubocop todo file
2016-02-18 14:08:04 +01:00
David Sedeño
28fbc518f3
Add registration_limit to conference model. Added the input for registration limit in the edit conference form. In the controller, if the limit has exceeded redirect to root_path with an alert. fix #761
2016-02-10 15:59:39 +01:00
Henne Vogelsang
919c69f7ae
Fix new rubocop offense
2016-02-08 14:57:23 +01:00
Stella Rouzi
f840f2b3f0
Rooms belong to venue
2016-02-06 17:43:51 +01:00
Stella Rouzi
feabbfbc99
rebase against email settings changes
2016-02-06 17:42:51 +01:00
Stella Rouzi
444356fbc7
Introduce Program to include cfp/rooms/tracks/events/event_types/difficulty_levels
2016-02-06 17:42:51 +01:00
Christian Bruckmayer
9e9c536946
Update rails to version 4.2
...
Furthermore it was necessary to add the following gems:
- responders
- web-console
And additional it was necessary to update these gems manually:
- devise
- turbolinks
- delayed_job_active_record
- money-rails
And the corresponding dependencies.
http://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#upgrading-from-rails-4-1-to-rails-4-2
2016-01-26 10:04:08 +01:00
Christian Bruckmayer
57610eb39e
Merge pull request #716 from differentreality/abilities
...
Abilities: Minor changes & grooming
2016-01-25 17:20:24 +01:00
Christian Bruckmayer
28e55f3f50
Merge pull request #737 from ChrisBr/commercial_new
...
Simplify adding commercials to conference and event
2016-01-21 20:29:03 +01:00
chrisbr
23664119bd
Implement simplified commercials workflow
...
It's now possible to simply enter the url of the third party provider to enter a commercial.
2016-01-21 19:41:12 +01:00
Stella Rouzi
17a1c0e87c
fix hakiri issue
2016-01-21 20:19:37 +02:00
chinmaydd
4eafa43f7e
Fixes Start date being greater than End date
2016-01-21 00:26:37 +05:30
Stella Rouzi
8ffa8b1e86
Venue has show action, not index. Make the ability to schedule an Event more clear.
2016-01-13 13:16:15 +02:00
Stella Rouzi
355ecc0ac6
Introduce strong parameters
2015-12-23 11:36:50 +02:00
Henne Vogelsang
6e9a8bbd59
Merge pull request #717 from AndrewKvalheim/shoulda-spring
...
Use recommended method for installing Shoulda Matchers with Spring.
2015-10-27 09:09:10 +01:00
Andrew Kvalheim
e593c1d1fb
Apply recommendation from thoughtbot/shoulda-matchers@a5623e7 .
2015-10-14 09:26:36 -07:00
raluka
9eb47bd3f0
merged from upstream
2015-10-14 16:02:40 +02:00
raluka
3d57203727
added more consistency for email_settings
2015-10-14 15:34:23 +02:00
Stella Rouzi
759aa54689
Syntax style + code groomming
2015-10-06 14:15:38 +03:00
raluka
0c4b0b4ac1
Refactored EmailSetting incosistency. Fixes #603
2015-10-06 11:32:40 +02:00
raluka
1fb1071feb
moved comment instance into before block
2015-09-17 12:13:22 +02:00
raluka
37339dccc1
refactored comments_controller tests; fixed access to Administration link into user_menu view
2015-09-17 12:13:22 +02:00
raluka
a9a43d726f
WIP created tests for comments_controller.rb
2015-09-17 12:13:22 +02:00
raluka
21c10166ec
added test file for comments_controller WIP
2015-09-17 12:13:22 +02:00
raluka
df29484317
changed wrong test for ability
2015-09-17 12:13:21 +02:00
raluka
e10a2491d3
created tests for user ability
2015-09-17 12:13:21 +02:00
raluka
b780996128
created comments with FactoryGirl
2015-09-17 12:13:21 +02:00
Henne Vogelsang
68efa06696
Merge pull request #660 from bgeuken/conference_model
...
Conference model
2015-07-02 16:28:06 +02:00
Stella Rouzi
8567a997cb
Merge pull request #679 from differentreality/switch
...
Rework bootstrapSwitch
2015-07-02 13:08:16 +03:00
Stella Rouzi
848aa5f12a
Small test addition for #687
2015-06-17 22:04:43 +03:00
Stella Rouzi
53f0606ac1
Rework bootstrapSwitch
2015-06-14 22:28:33 +03:00
Björn Geuken
a1d022d0be
Refactor user_registered? method
2015-05-27 16:06:14 +02:00
Björn Geuken
e334a6dec3
Add a test for user_registered?
2015-05-27 16:02:00 +02:00
Henne Vogelsang
01ba76e8c6
Merge pull request #638 from bgeuken/small_patches
...
Few things I stumbled over while waiting for tests to finish:)
2015-05-06 14:08:50 +02:00
Björn Geuken
68bbdb9fc9
Fix styling issue: " -> '
2015-05-05 14:04:26 +02:00
Henne Vogelsang
6cc8c1e5c2
Merge pull request #635 from bgeuken/refactor_calculate_progress
...
Refactor calculate progress
2015-04-20 17:21:15 +02:00
Björn Geuken
82edf7870a
event: refactor as_json method and add a test
2015-04-17 16:38:01 +02:00
Björn Geuken
80f8bba951
Refactor abstract_word_count method
2015-04-17 16:27:47 +02:00
Björn Geuken
ac0abce6e1
Small refactoring of calculate_setup_progress, part II
2015-04-17 14:46:21 +02: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
defef46ae8
Merge pull request #615 from hennevogel/master
...
Implements sign up during registration. Solves most of #215
2015-03-26 14:30:14 +01:00
Christian Bruckmayer
ff124632ef
Merge pull request #611 from shayonj/dashboard-status-minutes-fix
...
Fixing functions for minutes to hours conversion for dashboard
2015-03-16 12:20:51 +01: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
chrisbr
232cc249d4
Implements program section for unscheduled events
...
close #610
2015-03-09 15:31:06 +01:00
