Commit graph

518 commits

Author SHA1 Message Date
Chaitanya
4427f43bdf Enable Style/RedundantSelf Rubocop cop
This cop checks for redundant uses of self. It supports autocorrection, so all the offenses where automatically solved.

Closes #1373
2017-03-28 13:27:52 +05:30
Ana María Martínez Gómez
4b418238d2 Merge pull request #1378 from BelieveC/EnableDoubleNegation
Fixes #1374 to Enable Style/DoubleNegation Rubocop
2017-03-21 11:44:56 +01:00
Chaitanya
7de009e46e Enable Style/DoubleNegation Rubocop cop
This cop checks for uses of double negation (!!) to convert something to a boolean value. It doesn't support autocorrection, so all the offenses where manually solved.

Closes #1374
2017-03-20 19:12:40 +05:30
Ana María Martínez Gómez
125a7fe29a Merge pull request #1309 from commandprompt/bug_1298_fix_pr
fixes bug OSEM#1298
2017-03-17 15:44:47 +01:00
Alberto Miedes Garcés
e5aa6ab868 Fix bug in User#registered_to_event?
Fix exception being thrown in `User#registered_to_event?` when the user
is not registered in the corresponding event conference.
2017-03-17 11:26:47 +01:00
Chashmeet Singh
43dbb153c2 fix: #1345 (remove duplicate text in error message) 2017-03-14 22:32:24 +05:30
Siddhant Bajaj
dcfc25a541 Show vote versions in event history 2017-03-02 17:07:19 +05:30
gotens1211
ec1adbada8 Removed duplicate methods date_range_string and date_string.
Added tests for date_string function

corrections in the test
2017-03-01 15:39:10 +05:30
Eugene Dubinin
09696a4518 fixes bug OSEM#1298 2017-02-28 18:46:18 +02:00
Ana María Martínez Gómez
ebb5203887 Exclude conference model from ClassLength cop
Exclude conference.rb file from ClassLength Rubocop cop and decrease the
max value of this cop to 300, as the following class in number of lines is
event.rb with 218.

Also, remove unused comments from Conference model class.
2017-02-22 17:08:51 +01:00
Ana
b80aff3cce Add times to Conference
Add start hour and end hour to conference to be able to make the schedule times changeable
2017-02-22 09:09:29 +01:00
Hernán Schmidt
a0120734e3 Merge pull request #1287 from sheamunion/issue-1273
Issue 1273
2017-02-12 19:59:52 +01:00
shlok007
a2b3396897 rename intersecting_events to intersecting_event_schedules 2017-02-12 19:10:03 +05:30
Ana María Martínez Gómez
f42e4adc45 Merge pull request #1261 from shlok007/resources
Ability to track resources
2017-02-09 10:45:51 +01:00
Shea Munion
1d4140099f Remove dash from regex for short_title format validation. 2017-02-08 12:23:30 -06:00
shlok007
3065766da9 ability to track resources used in conference 2017-02-07 14:58:45 +05:30
gotens1211
4a9c971ec7 Enable Style/SpaceAroundOperators Rubocop
Cleared all the offenses for Style/SpaceAroundOperators

Added a description for the Style/SpaceAroundOperators Rubocop.
2017-02-05 19:43:00 +05:30
Ana María Martínez Gómez
945b4aac60 Merge pull request #1249 from commandprompt/configurable_schedules
implements configurable schedule granularity
2017-02-01 15:41:28 +01:00
Eugene Dubinin
ff9ca4a817 implements configurable schedule granularity and improves the schedule grid for denser schedule grids on smaller screens 2017-01-31 16:24:45 +02:00
Hernán Schmidt
a4ef10cf1b Merge pull request #1118 from rishabhs95/free-ticket
ability to create and purchase free tickets
2017-01-31 14:54:18 +01:00
Ana María Martínez Gómez
4089f16f17 Merge pull request #1253 from differentreality/1113
Rebases #1113
2017-01-31 10:08:38 +01:00
Rishabh Saxena
241bc89293
repair code reviews 2017-01-29 10:50:43 +05:30
Ana María Martínez Gómez
45c3c73e57 Merge pull request #1255 from shlok007/display-paid-and-unpaid-tickets
Display paid and unpaid tickets in admin/tickets#show
2017-01-26 16:27:24 +01:00
shlok007
d974807134 Display paid and unpaid tickets in admin/tickets#show 2017-01-23 22:37:57 +05:30
Nishanth Vijayan
5111d9e937 Extract checking if event is replacement to event_schedule model 2017-01-20 18:54:56 +02:00
Rishabh Saxena
e0d5b461b3
rubocop: annotate exceptions 2016-12-20 17:21:50 +05:30
Rishabh Saxena
fe828d24db
conference: refactor code and tests 2016-12-20 17:21:50 +05:30
Rishabh Saxena
53291e25b5
automatically create free ticket with new conf 2016-12-20 17:21:49 +05:30
Rishabh Saxena
4dcfc55418
add ability to create and purchase free tickets 2016-12-20 17:21:48 +05:30
differentreality
ea868d4cc7 voting period is open when voting dates are not set 2016-11-24 19:09:35 +02:00
Stella Rouzi
6c39d34322 Merge pull request #1159 from nishanthvijayan/changelog-improvements
Misc improvements to Revision History
2016-11-21 19:21:02 +02:00
richiethomas
daf1f805bd Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController' 2016-09-30 18:49:44 -04:00
Rishabh Saxena
d1c0c7d97a
registration#delete: retain ticket purchases 2016-09-26 20:57:11 +05:30
Nishanth Vijayan
7d70f7685e Track Schedule and EventSchedule 2016-09-26 17:21:45 +05:30
Nishanth Vijayan
b982d18bbb Use name/title instead of ID for associated object when showing changes 2016-09-26 17:21:45 +05:30
Stella Rouzi
c48c8afa51 Merge pull request #1161 from Ana06/room-event-schedule
Delete EventSchedules when a Room is deleted
2016-09-06 12:47:51 +03:00
Ana
c5c7cbeab9 Delete EventSchedules when a Room is deleted
We should remove all the EventSchedules that belongs_to a Room when it is deleted. Otherwise both the public and admin schedule would fail.
2016-08-18 16:19:15 +02:00
Hernán Schmidt
32019a11e1 Merge pull request #1108 from rishabhs95/stripe
Online payment feature - direct stripe integration
2016-08-18 16:04:11 +02:00
Stella Rouzi
99992750bb Merge pull request #1128 from nishanthvijayan/event-changelog
Improve event history page
2016-08-16 18:23:56 +03:00
Nishanth Vijayan
a02060b665 cfp team users should have access to event commercials only 2016-08-16 18:56:54 +05:30
Christian Bruckmayer
6c2dc92b84 Merge pull request #1148 from Ana06/event-schedule-validation
Validation in EventSchedule
2016-08-15 16:28:39 +02:00
Ana
f0a7f3c59b Validation in EventSchedule
Validation to avoid scheduling the same event twice for the same schedule.
2016-08-15 16:10:57 +02:00
Nishanth Vijayan
e2659ae907 Show changes to event commercials in event changelog 2016-08-15 18:18:03 +05:30
Nishanth Vijayan
da1c8fc691 Allow cfp team members to revert changes to events through event#history-content 2016-08-15 18:18:03 +05:30
Rishabh Saxena
a78804b94d add more tests to check Stripe exceptions 2016-08-15 10:59:36 +05:30
Rishabh Saxena
5c21d1c4d9 add Payment#purchase tests 2016-08-15 10:59:35 +05:30
Rishabh Saxena
a9ab1186f8 change rails initialisation.
repair abilities. add ticket purchasing check.
2016-08-15 10:59:35 +05:30
Rishabh Saxena
72ef33cbe6 remove stripe#customer creation.
remove amount validation.
2016-08-15 10:59:35 +05:30
Rishabh Saxena
112d2c6fff change camel case variable to ruby style. 2016-08-15 10:59:35 +05:30
Rishabh Saxena
1f9338735c improve Stripe error rescue. modify tests. 2016-08-15 10:59:34 +05:30