Dimitris
be72b9d02e
Allow user to remove openid
2017-06-13 13:04:55 +03:00
shlok007
cc5d47e6de
suggested changes
2017-06-12 19:43:44 +05:30
shlok007
b29856a122
suggested changes
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
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
hitman
b36d02ceec
change to can_manage_volunteers?
2017-05-26 15:47:01 +03:00
hitman
d9925f00e9
add volunteers helper
2017-05-26 15:47:01 +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
Siddhant Bajaj
1c12200003
Fixed paper trail inconsistent results for numeric values
...
There is a known issue in paper_trail that whenever we Query the
'versions.object' column it evaluates inconsistent results for numeric
values due to limitations of SQL wildcard matchers against the
serialized objects. So to fix this issue I have manually formed the where
query instead of using where_object and where_object_changes. I have
also added test for the same.
Fixes #1307
2017-05-11 14:01:52 +03:00
Eugene Dubinin
93404d543f
implement user creation by admin
2017-05-08 22:54:02 +03:00
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
nasia
a6e8283bcf
Fix commercial option for users in dashboard#show #1390
2017-04-24 10:16:39 +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
Christian Bruckmayer
dae9aca2c5
Merge pull request #1434 from nasia-sam/admin_resources
...
Fix admin/resources inherit
2017-04-05 13:17:31 +02:00
nasia
6414631a32
Fix admin/resources inherit
2017-04-04 21:30:16 +03:00
Eugene Dubinin
b7bdb29cbe
use flash.now instead of flash where page is rendered in the same controller methods
2017-04-03 20:15:51 +03: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
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
Stella Rouzi
5e9bc683ae
Move reports to separate controller
2017-03-20 17:51:37 +02:00
AEtherC0r3
88e1646e87
Fix unreachable code ( #1140 ) in ConferenceRegistrationController#new
...
Remove the unreachable code from ConferenceRegistrationController#new
Rework the error message logic in ConferenceRegistrationController#new
Fix redirect to #edit when the user is registered
Refactor ConferenceRegistrationController#new spec and add more tests
2017-03-07 17:40:19 +02:00
Siddhant Bajaj
dcfc25a541
Show vote versions in event history
2017-03-02 17:07:19 +05:30
Stella Rouzi
8b5d6603af
Merge pull request #1254 from shlok007/devise
...
Updated devise to 4.2.0
2017-03-01 13:29:44 +02:00
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
Ana
bde2ee3d7d
Delete Eventschedules out of conference hours
2017-02-22 09:17:34 +01:00
Ana
b3bbaf87a4
Adapt public schedule to use the confence hours
2017-02-22 09:17:34 +01:00
Ana
9b9d255e3b
Add fields in conference edit form for hours
...
Make possible to change the start and end hours.
2017-02-22 09:09:29 +01:00
JewelSam
56c69f51b7
#1040 Show email in public option
2017-02-14 17:54:31 +03:00
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
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
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
shlok007
296eefd1c2
updated devise to 4.2.0
2017-01-21 12:12:19 +05:30
Stella Rouzi
46101228e7
Merge pull request #1169 from nishanthvijayan/reports
...
Add new page with organizer reports
2017-01-15 12:28:38 +02:00
Rishabh Saxena
a6f7516eae
controller/ticket_purchase: rubocop fix
2016-12-20 17:21:49 +05:30
Rishabh Saxena
b36d4e98e2
ticket_purchase_controller: free ticket routing
2016-12-20 17:21:49 +05:30
Christian Bruckmayer
c4938166f5
Merge pull request #1228 from Ana06/fix_multichoice
...
Fix multiple choice questions
2016-12-19 17:40:38 +01:00
Ana María Martínez Gómez
50410f6e4f
Fix multiple choice questions
2016-12-15 11:50:23 +01:00
Rishabh Saxena
e07bdee7c1
hakiri: fix security issue
2016-11-22 09:58:20 +05:30
AnithaPal
68d447f023
added events, confirmed events and events with comments export features with xlsx, pdf and csv format
2016-10-19 10:48:58 -04:00
AnithaPal
3da3fcccbb
exporting events to pdf, excel, and csv format
2016-10-19 10:48:39 -04:00
Stella Rouzi
7cc2609662
Merge pull request #1189 from kormoc/support_jsonp_in_api
...
Support JSONP callbacks for the API/v1 endpoints
2016-10-17 23:35:20 +03:00
richiethomas
daf1f805bd
Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController'
2016-09-30 18:49:44 -04:00
Nishanth Vijayan
d954059947
Show missing speakers in reports
2016-09-28 03:03:01 +05:30
Nishanth Vijayan
fabe29d2ed
Add new page with organizer reports
2016-09-27 21:24:49 +05:30
Ana
7f843a3a13
Remove unnecessary code from conference_controller
...
Remove unnecessary code from conference_controller#update.
2016-09-26 13:36:44 +02:00
