2101 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthew	83c3c72e80	Correct indentation inconsistency in 404.html	2016-12-20 15:52:41 -06:00
Matthew	1ebab6f415	Update 404 page for user friendliness ... Replaced the generic Rails 404 page with a custom one that allows the user to link back to the homepage or submit a github issue. Also, included information for subscribing to the mailing list or finding the OSEM irc channel.	2016-12-20 15:33:33 -06:00
Matthew	95ab2ec3d4	Add osem-logo.png to /public/img directory ... Added an image file of the osem logo to the /public/img directory. File was added to be used in new more user friendly error pages.	2016-12-20 14:52:54 -06:00
Stella Rouzi	d07de3ca88	Merge pull request #1210 from jmks/proposals-event-type-description ... Fix event type description display on proposals#new and proposals#edit	2016-11-24 19:05:32 +02:00
Stella Rouzi	f30dd52edc	Merge pull request #1221 from nishanthvijayan/commercial-missing-version ... Check if commercial has versions before displaying commercial creator	2016-11-22 11:05:01 +02:00
Stella Rouzi	380389cb38	Merge pull request #1223 from rishabhs95/master ... hakiri: fix security issue	2016-11-22 11:02:50 +02:00
Nishanth Vijayan	8a0ce67daa	Check if commercial has versions before displaying commercial creator	2016-11-22 10:33:32 +05:30
Rishabh Saxena	e07bdee7c1	hakiri: fix security issue	2016-11-22 09:58:20 +05:30
Stella Rouzi	6c39d34322	Merge pull request #1159 from nishanthvijayan/changelog-improvements ... Misc improvements to Revision History	2016-11-21 19:21:02 +02: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
jmks	77cbbc1919	Fix event type description display on proposals#new and proposals#edit	2016-10-05 12:52:20 -04:00
Stella Rouzi	274fd25e30	Merge pull request #1207 from richiethomas/pluralize ... Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController'	2016-10-03 23:28:05 +03:00
richiethomas	daf1f805bd	Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController'	2016-09-30 18:49:44 -04:00
Stella Rouzi	0b6550d060	Merge pull request #1203 from desantonop/datatable ... Makes admin/tickets#index datatable	2016-09-29 11:22:28 +03:00
desantonop	cfdf4e331a	Makes admin/tickets#index datatable	2016-09-28 21:02:36 +03:00
Nishanth Vijayan	5100bf4c13	Add comment about displaying associated model object name in _object_changes	2016-09-28 18:50:40 +05:30
Nishanth Vijayan	1c42bf92c0	Link commercialable only if it exists else just display title/name	2016-09-28 18:42:18 +05:30
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
Nishanth Vijayan	5a5b686830	Display event,user title/name only if they exists or when they have versions	2016-09-26 17:21:45 +05:30
Nishanth Vijayan	b30afccfba	When displaying changes, use '-' if id of associated object is blank	2016-09-26 17:21:45 +05:30
Nishanth Vijayan	75ee1371de	Cleanup obj_desc_and_link	2016-09-26 17:21:45 +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
Nishanth Vijayan	c7b8418f1a	Fix linking problems for event and venue commercials	2016-09-26 17:21:44 +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
Stella Rouzi	66244a92fd	Merge pull request #1200 from richiethomas/commercial ... Fix admin conferences program events#show page, now only shows a red X when commercial is missing	2016-09-26 12:20:06 +03: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
Christian Bruckmayer	393458ca11	Merge pull request #1167 from Ana06/schedule-bug ... Fix bug in the schedule	2016-08-23 11:22:57 +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	1eaf810548	In Travis, run tests on MariaDB	2016-08-22 16:39:19 +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
Stella Rouzi	8335aa8b43	Merge pull request #1163 from nishanthvijayan/cleanup-events-controller ... Remove ununsed code from events_controller#index	2016-08-19 17:53:05 +03:00
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