gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2087 commits 2 branches 2 tags 50 MiB
Commit graph

1303 commits

Author SHA1 Message Date
AnithaPal
881518f1f3 cycle method added to auto cycle through tweets and exception handling is modified to capture all errors that raise from twitter 2016-12-21 12:46:46 -05:00
AnithaPal
f29a15b8e4 twitter gem and a partial added to embed tweets about a conference and new layout added for conference info screen 2016-12-21 12:46:45 -05:00
AnithaPal
febd3451ad is_current method added to check an event is current and function addded to refresh conference_wide_information 2016-12-21 12:46:45 -05:00
AnithaPal
35afdcead4 added conference wide information page and linked to the admin sidebar 2016-12-21 12:46:45 -05:00
Stella Rouzi
710b4d26a4 Merge pull request #1174 from AnithaPal/export-events-and-comments 
Export events and comments
 2016-11-16 01:44:05 +02:00
Stella Rouzi
5001e1c7d8 Merge pull request #1214 from AEtherC0r3/master 
Converts old ruby syntax to new in admin/emails#index
 2016-10-23 15:08:46 +03:00
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
AEtherC0r3
1ca6559400 Converts old ruby syntax to new in admin/emails#index 2016-10-14 20:08:58 +03:00
richiethomas
daf1f805bd Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController' 2016-09-30 18:49:44 -04:00
desantonop
cfdf4e331a Makes admin/tickets#index datatable 2016-09-28 21:02:36 +03:00
Stella Rouzi
0b77fd4afe Merge pull request #1164 from rishabhs95/ticket-deletion 
Don't delete user's purchased tickets after user unregisters
 2016-09-28 00:13:47 +03:00
Rishabh Saxena
d1c0c7d97a
registration#delete: retain ticket purchases 2016-09-26 20:57:11 +05:30
Stella Rouzi
b02792464d Merge pull request #1187 from Ana06/conference 
Remove unnecessary code from conference_controller
 2016-09-26 17:38:09 +03:00
Ana
7f843a3a13 Remove unnecessary code from conference_controller 
Remove unnecessary code from conference_controller#update.
 2016-09-26 13:36:44 +02:00
richiethomas
3daf624d75 Fix admin conferences program events#show page, now only shows a red X when commercial is missing 2016-09-19 12:51:50 -04: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
Stella Rouzi
85fcd4e1b7 Merge pull request #1115 from rishabhs95/admin-tickets-quantity 
Display correct quantity of tickets in admin views
 2016-09-15 13:05:28 +03:00
Rishabh Saxena
09ec8565d9 admin/tickets: add column for quantity 2016-09-14 19:40:43 +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
Stella Rouzi
46774748ba Merge pull request #1114 from nishanthvijayan/event-missing-info 
Show Event missing info in admin
 2016-08-26 18:42:59 +03:00
Henne Vogelsang
73bfc4b708 Merge pull request #1162 from lagartoflojo/mysql-tests 
Make tests pass on MySQL
 2016-08-23 11:41:23 +02:00
Ana
297a2e02a2 Fix bug in the schedule 
The events which start time was the one of the last cell of the table were not rendered.
 2016-08-22 21:52:42 +02:00
Hernan Schmidt
393deefcf9 Use a css regex matcher to find campaign entries 2016-08-22 11:23:18 +02:00
Nishanth Vijayan
f02aaac81e Show an event's missing info in event#show 2016-08-21 15:41:34 +05:30
Nishanth Vijayan
48828f8930 Display who added commercial for event 
Activate versioning for tests

The tests were failing because of the lack of versioning.By default, versioning is off for tests.
As a result, here (app/views/proposal/_form.html.haml L43) commercial,versions.last returns nil as there are no versions.
 2016-08-20 14:21:21 +05:30
Nishanth Vijayan
2785902dba Remove ununsed code from events_controller#index 2016-08-19 00:01:50 +05:30
Rishabh Saxena
54ad0628b4 admin/tickets: correct ticket_purchase quantity 2016-08-18 23:27:30 +05:30
Hernan Schmidt
9eb4ac2738 Fix campaign features to work with MySQL 2016-08-18 18:32:41 +02: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
charliequinn
ef9ba3b981 Added specs for ApplicationHelper.show_time 
- refactor of code to use divmod and handle decimal number parameter
- return '0 h 0 min' if length blank
 2016-08-17 13:55:29 +01: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
Stella Rouzi
10121ae6d0 Merge pull request #1110 from jmks/ichain-signin-page-layout 
Updated layout of ichain sign in page
 2016-08-16 13:48:57 +03:00
Stella Rouzi
9c5fd18c3e Merge pull request #1097 from shlok007/manual_confirmation 
Ability to confirm users by admin
 2016-08-16 13:43:27 +03:00
shlok007
c50e8c0466 Implemented ability of admins to manually confirm users 2016-08-16 02:23:41 -04:00
charliequinn
89d45f62a0 Bug fix nil parameter ApplicationHelper.markdown 
Added specs for nil value parameter and header markdown
 2016-08-16 00:33:32 +01:00
Rishabh Saxena
060d65c430 views/_payment: decrease script indentation 2016-08-16 00:43:48 +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
Nishanth Vijayan
0a3466ca7c Move shared version partials to views/shared 2016-08-15 18:17:59 +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
6aecf2d446 modify conference registration view message 2016-08-15 10:59:36 +05:30