Commit graph

2483 commits

Author SHA1 Message Date
Siddhant Bajaj
d7678b2fa0 Added model test
Added test for physical ticket model.
2017-06-22 19:51:08 +05:30
Siddhant Bajaj
5c56683ae8 Introduced Physical Ticket
Added PhysicalTicket model and controller. It holds the information about each physical ticket bought at the purchase. Physical Tickets are created after every successfull payment.
2017-06-22 19:50:55 +05:30
Eugene Dubinin
1c38b091cc Fixes for PostreSQL support 2017-06-20 15:49:15 +03:00
Ana María Martínez Gómez
f2c0367a74 Merge pull request #1545 from dPliakos/enable_rails_find_each
Enable rails/findEach Rubocop cop
2017-06-20 10:38:29 +02:00
Dimitris
d160c22a0b Enable rails/findEach Rubocop cop
This cop enforce the use of `find_each` instead of `each`.

Closes #1535
2017-06-20 10:46:04 +03:00
Ana María Martínez Gómez
4d895ae3bc Merge pull request #1541 from siddhantbajaj/travis
Improved test performance.
2017-06-16 10:04:21 +02:00
Stella Rouzi
2f70a1ddd1 Avoid horizontal scroll bar 2017-06-15 13:54:06 +03:00
siddhantbajaj
0496ed23e5 Improves test speed 2017-06-15 04:26:15 +05:30
Ana María Martínez Gómez
e3f5b48d26 Merge pull request #1543 from shlok007/update-nokogiri
Update nokogiri to 1.8.0
2017-06-14 22:42:22 +02:00
Ana María Martínez Gómez
bfcb1a3164 Merge pull request #1536 from divyanshumehta/issue_1531
Add Style/SelfAssignment Rubocop Cop
2017-06-14 22:41:37 +02:00
shlok007
58c80f1447 update nokogiri to 1.8.0 2017-06-14 22:12:10 +05:30
divyanshumehta
cdf794ecbf Add Style/SelfAssignment Rubocop cop
The cop enforces use of self assignment operator E.g. a=a+2 gets
written as a+=2. Also the offenses listed in rubocop.todo.yml
have been corrected automatically with the --auto-correct option.
Fixes issue #1531
2017-06-14 09:22:19 +05:30
Dimitris
be72b9d02e Allow user to remove openid 2017-06-13 13:04:55 +03:00
Shlok Srivastava
703dce4f5c Merge pull request #1517 from shlok007/copy-organizations
Introduce organizations to OSEM
2017-06-12 23:21:09 +05:30
Shlok Srivastava
6bb2143282 Merge branch 'master' into copy-organizations 2017-06-12 22:46:53 +05:30
Ana María Martínez Gómez
53040b3be9 Merge pull request #1498 from divyanshumehta/issue_1497
Added Style/SpaceInsideBrackets Rubocop cop
2017-06-12 17:45:30 +02:00
shlok007
cc5d47e6de suggested changes 2017-06-12 19:43:44 +05:30
shlok007
6cf9ddbdea fix failing test 2017-06-12 19:43:44 +05:30
shlok007
521c05af61 skip failing tests 2017-06-12 19:43:44 +05:30
shlok007
b29856a122 suggested changes 2017-06-12 19:43:44 +05:30
shlok007
949f5cb591 add foreign key to conferences 2017-06-12 19:43:44 +05:30
shlok007
cce3ff7aea creating default organization while creating a conference 2017-06-12 19:43:44 +05:30
shlok007
3fb316482c suggested changes 2017-06-12 19:43:44 +05:30
shlok007
ac85bad9b3 migrate conferences to organizations 2017-06-12 19:43:44 +05:30
shlok007
e0d8e85808 suggested changes 2017-06-12 19:43:44 +05:30
shlok007
8edf896d86 introduce organizations 2017-06-12 19:43:44 +05:30
Shlok Srivastava
bf54487a19 Merge pull request #1537 from shlok007/fix-haml-lint
Fixes failing haml-lint in admin/conferences/show
2017-06-12 19:28:20 +05:30
shlok007
ce9d2b3c5b fixes failing haml-lint in admin/conference/show 2017-06-12 18:37:50 +05:30
nasia
8cd3326520 Add charts about sold tickets 2017-06-12 15:24:27 +03:00
AEtherC0r3
41503bb7a0 Compute ticket statistics
And exclude admin/ConferencesController from rubocop_todo.yml
2017-06-12 15:24:27 +03:00
AEtherC0r3
c2184c1c4f Add 'week' column to TicketPurchases 2017-06-12 15:24:27 +03:00
selini
9ff3601453 remove unnecessary functions 2017-06-12 12:31:31 +03:00
selini
071ed50acb Hide recent Registrations/Submissions when conference is over 2017-06-12 12:31:31 +03:00
divyanshumehta
1223fef87c Use of rubocop compliant unescaping methods in application_helper.rb 2017-06-11 22:57:52 +05:30
divyanshumehta
0d01ed08b0 Added Style/SpaceInsideBrackets Rubocop cop 2017-06-11 22:57:52 +05:30
Ana María Martínez Gómez
415eadf477 Merge pull request #1533 from mdeniz/split_travis_builds
Split in 2 jobs Travis builds
2017-06-10 02:21:06 +02:00
mdeniz
ebe1ca374d Fix the Travis failure in the last PR about axlsx dependencies 2017-06-09 14:41:51 +02:00
mdeniz
5acb4a9339 Split in 2 jobs Travis build 2017-06-09 14:41:44 +02:00
AEtherC0r3
7a7fcced48 Replace .today with .current in program spec
The cfp_open? method uses Date.current, so it should also be tested with
Date.current and not Date.today
Also, build was replaced with create to fix a false negative

This is a partial fix for #1522
2017-06-07 15:04:07 +03:00
Ana María Martínez Gómez
08e5f10559 Merge pull request #1471 from nasia-sam/rubocop_string_array
Add Style/WordArray at rubocop.yml #1463
2017-06-06 14:56:38 +02:00
nasia
6cb11ff2f3 Add Style/WordArray at rubocop.yml #1463 2017-06-06 13:53:05 +03:00
AEtherC0r3
5bb52f24a5 Ignore html_safe in application helper 2017-06-04 15:31:45 +03:00
AEtherC0r3
02d75ec729 Fix registration sorting
Sort the 'Actions' column by registration.attended
2017-06-03 12:37:56 +03:00
Hernán Schmidt
48475b7eba Merge pull request #1504 from shlok007/add-gsoc-label
Introduce label to group GSoC work together
2017-05-30 09:20:13 +02:00
shlok007
1f0601be1b Introduce label to group GSoC work together 2017-05-29 17:26:25 +05:30
Agrim Mittal
e68738c154 update rubocop_todo.yml 2017-05-26 15:47:01 +03:00
Agrim Mittal
255744268b shift relevant functions to versions_helper 2017-05-26 15:47:01 +03:00
Agrim Mittal
b4c2eeb772 change name to versions_helper 2017-05-26 15:47:01 +03:00
hitman
60afb2a474 refractor can_manage_volunteers? 2017-05-26 15:47:01 +03:00
hitman
dbffece956 remove !! from can_manage_volunteers 2017-05-26 15:47:01 +03:00