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

1556 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aditya Prakash
7822a8d4e3 Do not allow signed in users to registor unless registration is open 2016-03-14 23:38:55 +05:30
Aditya Prakash
7e4d91adaf Improvements in registration specs 
Check for true and not truthy in registration model spec.
Cover general cases in conf registration controller.
Add test for flash in new action when ichain is set and user is not signed in.
 2016-03-12 17:58:14 +05:30
Aditya Prakash
5bff60ec7d Tests for ConferenceRegistrations controller 
Authorization needs to be done first or else it will give
CanCan::AuthorizationNotPerformed error for some of branches.
Removed if condition is dead code.
Small fix in flash message of destroy and its feature test.
 2016-03-11 03:06:00 +05:30
Aditya Prakash
13a6586f81 Tests for registration model 
Before registration we need to make sure that conference has registration_period
 2016-03-11 03:06:00 +05:30
Aditya Prakash
c71d15565e Fix authorization of new and create in ConferenceRegistrationsController 
Before authorization we need to set conference relation.
Change in proposal spec cause conference has to have valid registration
period for successful redirect to registration after confirm proposal.
 2016-03-11 03:06:00 +05:30
Christian Bruckmayer
b18e302224 Merge pull request #852 from differentreality/programs_typo 
Fix variable @program typo in programs#show
 2016-03-10 15:51:29 +01:00
Henne Vogelsang
62bc035e53 Merge pull request #862 from ChrisBr/ichain 
Fixes for production errors
 2016-03-10 15:28:12 +01:00
Henne Vogelsang
15ba6449ea Merge pull request #863 from ChrisBr/config 
Remove duplicate delivery_method config option
 2016-03-10 15:24:03 +01:00
Christian Bruckmayer
2f23ba2fd3 Remove duplicate delivery_method config option 2016-03-10 15:06:59 +01:00
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
18645081ac Merge pull request #861 from sonalkr132/admin-proposal-overflow 
Fix overflow of proposal edit in admin area
 2016-03-10 14:48:56 +01:00
Aditya Prakash
afc58d3d85 Fix overflow of proposal edit in admin area 2016-03-10 17:42:09 +05:30
Stella Rouzi
fb4e8958e0 Fix variable @program typo in programs#show 2016-03-09 20:11:59 +02:00
Henne Vogelsang
976616b47b Protect root_path from forgery with null_session 
Some proxies query OPTIONS for / to see if the page
is alive.
 2016-03-09 15:12:58 +01:00
Henne Vogelsang
36f3730846 Adopt the schema to latest migration 2016-03-09 15:12:53 +01:00
Henne Vogelsang
9c2ef19741 Don't require support/external_request from rake tasks 
If we require this we're requiring everything that
support/external_request requires for production.
 2016-03-09 13:34:54 +01:00
Henne Vogelsang
fd8dbfe7a7 Fix autloading of webmock/rspec in production 
Autoload apparently also load spec/ which requires
webmock/rspec which was not installed in production
 2016-03-09 12:03:27 +01:00
Henne Vogelsang
97ca07d142 Merge pull request #841 from chocoelho/unset_footer_fixed_height 
Unset footer fixed height
 2016-03-09 11:47:26 +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
1990d3a1ad Merge pull request #837 from sonalkr132/room-ticket-tests 
Tests for room model and controller
 2016-03-09 12:04:12 +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
Henne Vogelsang
877402e837 Merge pull request #849 from nishanthvijayan/fix-markdown-editor-assetgem 
Fix markdown editors bug #811 using asset gem.
 2016-03-08 18:06:35 +01:00
Nishanth Vijayan
f713d1eac5 Check installed Bundler version 2016-03-08 21:14:44 +05:30
Nishanth Vijayan
34e8dade05 Enforce min bundler version required by rails-assets 2016-03-08 19:20:35 +05:30
Nishanth Vijayan
64b825cebe Fix markdown editors bug #811 using asset gem. 2016-03-08 16:50:30 +05:30
Henne Vogelsang
b9469f6a17 Merge pull request #847 from ChrisBr/update_country_select 
Update country_select gem
 2016-03-08 11:23:50 +01:00
Stella Rouzi
34f2c1f395 new db/schema 2016-03-08 00:19:54 +02:00
Stella Rouzi
40a48e1e7e Update rolify and cancancan 2016-03-07 23:32:15 +02:00
Christian Bruckmayer
d5f138b3dc Update country_select gem 
and removed git repository from Gemfile. Caused bundle install error in vagrant box.
 2016-03-07 18:28:14 +01: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
Henne Vogelsang
25e879ee13 Merge pull request #825 from chocoelho/switch_vagrant_box 
Updated vagrant box to official Leap release
 2016-03-07 16:24:23 +01:00
Henne Vogelsang
c9cce9fcca Update INSTALL.md 
Add `vagrant exec` instructions
 2016-03-07 14:52:39 +01:00
Aditya Prakash
7b3208b43b Tests for room controller 2016-03-07 19:19:48 +05:30
Christian Bruckmayer
feeac2a816 Merge pull request #846 from chocoelho/add_conference_email 
Add conference email to splashscreen
 2016-03-07 14:19:05 +01:00
Carlos Coelho
fda08ecdb5 Added email to social media section 
related to #764

Signed-off-by: Carlos Coelho <carlos@pencillabs.com>
 2016-03-07 09:47:21 -03: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
Christian Bruckmayer
c61696a3f8 Merge pull request #845 from rishabhs95/admin-view-users-datatable 
Making datatable responsive in admin's users view.
 2016-03-07 11:26:53 +01:00
Henne Vogelsang
636eb40499 Merge pull request #831 from ChrisBr/letter_open_web 
Add letter_opener_web
 2016-03-07 10:50:30 +01:00
Rishabh Saxena
2c1db3bd2a Making datatable responsive in admin's users view. 2016-03-07 15:15:29 +05:30
Carlos Coelho
0336171e4a Unset footer fixed height 
If footer is set to a fixed height, it makes some white block
between footer and bottom of page.

Its height should be resized according to footer content.

Related to #840

Signed-off-by: Carlos Coelho <carlos@pencillabs.com>
 2016-03-06 22:20:13 -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
69a4139268 Tests for room model 2016-03-06 17:09:02 +05:30
Aditya Prakash
c219ffc9a3 Tests for Admin::Targets controller 
Authorization in index action is not needed.
Fix failed delete flash error message.
 2016-03-06 10:46:04 +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
ac7149fbe5 Merge pull request #832 from ChrisBr/vagrant 
More Vagrant fixes
 2016-03-05 16:23:13 +01:00
Christian Bruckmayer
50d946e4a7 Fixes setup db if statement in bootstrap.sh 
to setup the database if there is no developement and no test database already.
 2016-03-05 15:15:22 +01:00
Christian Bruckmayer
38296b0a63 Rename options.yml to config.yml in bootstrap.sh 
options.yml does not exists in context of OSEM.
Probably a c&p error.
 2016-03-05 15:13:56 +01:00
Christian Bruckmayer
2dad051ab9 Add letter_opener_web 
to present emails in the browser in development mode.
Using letter_opener in combination with Vagrant does not work
because it's not possible to launch a web browser in your
Vagrant box. Fixes #817.
 2016-03-05 14:09:42 +01:00