Christian Bruckmayer
a6c89351c5
Make Comment find_since_last_login scope robust against nil value
...
to fix production ArgumentError: bad value for range. Fixes #807 .
2016-03-10 15:04:14 +01:00
Christian Bruckmayer
55ab8a8e8f
Set sign_in attributes on iChain login
...
Set last_sign_in_at and current_sign_in_at attributes when iChain login is enabled. #807
2016-03-10 15:04:02 +01:00
Henne Vogelsang
0df693ffbf
Merge pull request #820 from differentreality/update_rolify
...
update rolify
2016-03-09 11:32:52 +01:00
Stella Rouzi
782a1f071f
Merge pull request #801 from sonalkr132/targets_test
...
Model and controller tests for Target
2016-03-09 12:13:53 +02:00
Stella Rouzi
e560d263c9
Merge pull request #838 from sonalkr132/ticket-tests
...
Tests for ticket model
2016-03-09 12:03:52 +02:00
Stella Rouzi
40a48e1e7e
Update rolify and cancancan
2016-03-07 23:32:15 +02:00
Christian Bruckmayer
9fbd2e9618
Merge pull request #827 from hennevogel/feature-proposal_for_track
...
Feature: Add/change Track for Event
2016-03-07 17:12:33 +01:00
Carlos Coelho
483d9a234e
Verified contact has email or not
...
issue #764
Signed-off-by: Carlos Coelho <carlos@pencillabs.com>
2016-03-07 09:43:55 -03:00
Aditya Prakash
ebd01f064a
Tests for ticket model
...
Change in error message of validation cause previously it was:
"Price currency Currency is different.."
`paid?` method returned true even when `ticket_purchases` is empty for
a given user.
2016-03-06 17:37:06 +05:30
Aditya Prakash
680d23a64a
Tests for target model
...
created_at and due_date are preset cause we don't want it to depend
on system time.
2016-03-06 10:46:03 +05:30
Christian Bruckmayer
c5c392d4c7
Merge pull request #794 from differentreality/user_model_tests
...
Add tests for Event. Remove redundant function 'def week' from Event.
2016-03-05 13:45:39 +01:00
Henne Vogelsang
feaf9d8078
Feature: Add/change Track for Event
2016-03-05 02:54:09 +01:00
Stella Rouzi
81c82466f8
Add tests for Event. Remove redundant function 'def week' from Event.
2016-03-04 19:46:25 +02:00
Stella Rouzi
18bb1bd237
Merge pull request #770 from hennevogel/feature_venue_show
...
Beautify venue#show
2016-03-04 19:44:49 +02:00
Henne Vogelsang
33e1c6eae1
Beautify venues#show
2016-03-04 17:05:42 +01:00
Stella
ccd7ecbb90
Roles into their own controller. Rework interface. Add flash messages to ajax calls. Add description to roles. Possible to edit roles in use.
2016-03-01 17:10:45 +02:00
Stella Rouzi
f567187d45
Add validations for registration_period
2016-02-23 12:57:45 +02:00
Henne Vogelsang
ed0f55c45f
Fix remaining rubocop problems
2016-02-18 14:40:24 +01:00
Henne Vogelsang
e2fb83146a
Merge pull request #768 from hennevogel/rubocop
...
Update rubocop todo file
2016-02-18 14:08:04 +01:00
Stella Rouzi
405b614c43
Merge pull request #783 from davidsf/fix_proposal_confirmation
...
Fix error 500 in user proposal confirmation
2016-02-18 14:00:02 +02:00
David Sedeño
4783bc99b5
Fix error 500 in user proposal confirmation. fix #782
2016-02-17 18:19:32 +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
046f726414
rubocop: Update todo file, enable rails cops
2016-02-08 14:57:23 +01:00
Henne Vogelsang
6fa3864771
Fix CFP ability
2016-02-08 12:53:13 +01:00
Stella Rouzi
a0d045e156
Remove attr_accessible from Program and Cfp, final fixes after introducing strong params
2016-02-06 17:43:51 +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
57610eb39e
Merge pull request #716 from differentreality/abilities
...
Abilities: Minor changes & grooming
2016-01-25 17:20:24 +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
152b59aade
Fix failed tests of #756
2016-01-21 13:05:27 +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
raluka
3d57203727
added more consistency for email_settings
2015-10-14 15:34:23 +02:00
raluka
0c4b0b4ac1
Refactored EmailSetting incosistency. Fixes #603
2015-10-06 11:32:40 +02:00
raluka
1b63728440
Grooming conference.rb to fix rubocop offenses
2015-09-17 12:23:01 +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
1addae9cd9
WIP changed CommentsController#index; temporary view for all_comments
2015-09-17 12:13:22 +02:00
raluka
800a41b3f9
added logic for available conferences based on roles in comments_controller.rb
2015-09-17 12:13:22 +02:00
raluka
52a503afd2
changed #signed_in_with_roles(user) in ability.rb model
2015-09-17 12:13:21 +02:00
raluka
df29484317
changed wrong test for ability
2015-09-17 12:13:21 +02:00
raluka
74dcd75a8c
created can_manage_comments helper for rendering button
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
raluka
35714f350e
Issue#15: Added Comment Notifications: notification_emails and comments view
2015-09-17 12:13:21 +02:00
Stella Rouzi
fb607050fe
undo deletion of function, so that api works (/api/v1/conferences/)
2015-09-16 10:25:52 +03:00
Christian Bruckmayer
244ea9d34a
Merge pull request #708 from raluka/remaining_days
...
Issue #649 : Wrong days remaining label when submitting a new proposal
2015-08-28 13:27:42 +02:00
raluka
1de8f979cd
Issue #649 : Wrong days remaining label when submitting a new proposal
2015-08-27 10:35:43 +02:00
Stella Rouzi
2a6ca7b0ff
Fix ordering for event.average_voting in events#index
2015-08-06 07:41:20 +03:00
