Commit graph

552 commits

Author SHA1 Message Date
Eugene Dubinin
1c38b091cc Fixes for PostreSQL support 2017-06-20 15:49:15 +03: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
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
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
3fb316482c suggested changes 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
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
divyanshumehta
0d01ed08b0 Added Style/SpaceInsideBrackets Rubocop cop 2017-06-11 22:57:52 +05:30
nasia
6cb11ff2f3 Add Style/WordArray at rubocop.yml #1463 2017-06-06 13:53:05 +03:00
AEtherC0r3
fa56ff7f6d Add helper function for speaker selection
The line '@users = User.all.order(:name)' is replicated a lot of times
in EventsController and ProposalsController.
So, this commit removes it and adds a helper function
'speaker_selector_input' that generates the field where the @users
variable was used.
Also, it makes the query more specific.

Fix #1455

Other changes:
* Include the username in the drop down menu
* Add .active scope to User and corresponding tests
* Add :disabled trait to User factory
2017-05-20 18:27:07 +03:00
AEtherC0r3
36b8088726 Replace submitter with speakers in reports#index
Also, in events#show and proposals#index

It is more relevant to check if the speakers have registered to the
conference and filled their biographies than the submitter, because,
there can be multiple speakers and the submitter isn't necessarily one
of them

And, remove admin/events/reports.html.haml, since, it isn't used anymore

Fix #1477, fix #1479
2017-05-20 18:26:45 +03:00
Sergio Lindo Mansilla
207b3611c6 Change too bright color to matte
- The bright colors makes the labels unreadable on some screens.
2017-05-15 15:49:19 +02:00
hitman
e73baa2754 add validation for name, used and quantity 2017-05-13 18:30:30 +03:00
AEtherC0r3
fdff485b3e Allow confirmed speakers to register anytime
If the registration period is over then speakers of confirmed events
can't register anymore. They should be able to, since they are gonna be
there anyway.

* Allow the speakers of confirmed events to register regardless of the
registration period
* Provision for registrations of confirmed speakers, so as not to
exceed the registration limit
* Add scope for registered speakers

Fix #829 and fix #802
2017-05-13 17:47:22 +03:00
Eugene Dubinin
93404d543f implement user creation by admin 2017-05-08 22:54:02 +03:00
Siddhant Bajaj
7ff34c5b23 Added relation between EventSchedule and program model
Program has many event_schedules through schedules
2017-04-25 18:00:24 +05:30
Siddhant Bajaj
7ce816e146 Fixed DeleteEventSchedules issue
Issues with DeleteEventSchedules method in conference controller:
1.It deletes EventSchedules of all the conferences that are not in the
hours range. Instead it should delete EventSchedules of those events
only that belong to that particular conference only.
2.If we set invalid start or end hour attribute of a conference then
also EventSchedules gets deleted even though conference is not
successfully updated.
Fixed both the issues and added test for the same.
2017-04-25 18:00:24 +05:30
Siddhant Bajaj
95d459f058 Added validation in EventSchedule model and test in event_schedule_spec
EventSchedule start time should be in hours range of the conference.Therefore it adds validation on start_time attribute of event schedule model. It also adds test for the same.
2017-04-22 01:20:05 +05:30
Siddhant Bajaj
cd9f329939 Fixed Confirmed Scheduled Events issue
Fixed issues with scheduled_event_distribution method in conference.rb
and added test in conference_spec.rb to confirm issue is fixed.
Fixes #1302
2017-04-18 18:30:42 +05:30
Stella Rouzi
92cb010cc6 Merge pull request #1448 from nasia-sam/cfp_access_to_schedule
Add permission to access admin/shedule by cfp #1432
2017-04-14 17:14:21 +03:00
nasia
11938025cf Add permission to access admin/shedule by cfp#1432 2017-04-13 20:45:19 +03:00
Eugene Dubinin
790e2fd3a2 implement manual event management and support for multiple speakers per event 2017-04-13 17:15:21 +03:00
Ana María Martínez Gómez
fd6d0bf39b Merge pull request #1446 from sunny-b/master
Enable Style/DotPosition Rubocop cop
2017-04-07 11:21:34 +02:00
Sunny
03fa299058 enable style/dotposition rubocop cop 2017-04-06 23:19:58 -04:00
Ana María Martínez Gómez
f3e712a1bc Merge pull request #1319 from JewelSam/master
#1220 adding the cell size attribute to the database
2017-04-03 10:23:49 +02:00
JewelSam
f6e74461ba Add schedule interval as attribute of a program
Also, the part of the schedule event is deleted and the length of the event types
changes to the nearest suitable after changing the length of the interval.

This closes #1220
2017-04-01 21:39:20 +03:00
Ana María Martínez Gómez
42741fa90b Merge pull request #1352 from BelieveC/ScheduleLogIn
Fixes #1343, Allow viewing public schedule without login
2017-03-31 15:58:26 +02:00
Emanuel Hayford
e5587d42a2 Enable Rails/Validation Rubocop cop
Cop checks for the use of old-style attribute validation. Supports autocorrection which was run
to fix the files concerned

Closes #1414
2017-03-28 21:47:31 +02:00
Chaitanya
782937b1d9 Enable Style/ZeroLengthPredicate Rubocop cop
This cop checks for numeric comparisons that can be replaced by a predicate method. It supports autocorrection, so all the offenses where automatically solved.

Closes #1416
2017-03-28 14:42:21 +05:30
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
Chaitanya
0e8e626156 Allow to view schedule without login
Add show and events action's can abilities of schedule for not_signed_in user in order to make schedule available to view without login.

Closes #1343
2017-03-24 20:52:27 +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