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
Rob Smith
de4563ddb1
Remote forgery protection for json requests to the api/v1 endpoints
...
Due to my testing, I incorrectly removed the forgery protection
skip action from the controllers in the api. This fixes that and allows jsonp
calls to work correctly
2016-09-17 19:31:22 -07:00
Rob Smith
70e0f42bbb
Support JSONP callbacks for the API/v1 endpoints
...
SeaGL currently uses OSEM as a backend, but still has a static website
serving as our public interface. The API endpoints have a great amount
of data, but without the jsonp callback paramater, embedding the data
is a bit difficult. This change just adds the jsonp callback param
to all the API endpoints. This should be a NOOP for anyone using direct
json calls, but will allow cross domain requests that require jsonp.
2016-09-17 19:31:21 -07:00
Nishanth Vijayan
2785902dba
Remove ununsed code from events_controller#index
2016-08-19 00:01:50 +05:30
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
shlok007
c50e8c0466
Implemented ability of admins to manually confirm users
2016-08-16 02:23:41 -04:00
Nishanth Vijayan
e2659ae907
Show changes to event commercials in event changelog
2016-08-15 18:18:03 +05:30
Nishanth Vijayan
c80f37f3ff
Change look of event history page similar to changelog
2016-08-15 16:48:10 +05:30
Stella Rouzi
86ba2d005e
Merge pull request #1019 from nishanthvijayan/changelog
...
Changelog/Revision History page
2016-08-15 14:16:12 +03:00
Rishabh Saxena
164101f2fe
change "purchase" to "get" in views
2016-08-15 10:59:36 +05:30
Rishabh Saxena
261d7dd0de
improve flash error collection
...
improve views
2016-08-15 10:59:36 +05:30
Rishabh Saxena
4b0a5b1125
move params merge to private method
2016-08-15 10:59:35 +05:30
Rishabh Saxena
048f20bcfc
fix typo. change secrets.yml config.
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
