2136 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ana María Martínez Gómez	e61acde1e2	Fix bug in the schedule ... Events that should be rendered in more than one carousel section are only rendered in the first one.	2017-01-18 23:13:12 +01:00
Christian Bruckmayer	4a75546e6c	Merge pull request #1246 from Ana06/db_cleaning ... Improvements in the DatabaseCleaner	2017-01-17 14:22:26 +01:00
Stella Rouzi	46101228e7	Merge pull request #1169 from nishanthvijayan/reports ... Add new page with organizer reports	2017-01-15 12:28:38 +02:00
Stella Rouzi	de2e316fee	Merge pull request #1244 from AEtherC0r3/fix_table ... Adds table header in admin/events#index	2017-01-11 19:47:52 +02:00
Stella Rouzi	845c9234e9	Merge pull request #1245 from AEtherC0r3/fix_id ... Find correct event id in versions	2017-01-11 19:46:31 +02:00
Ana María Martínez Gómez	e4104ba2cd	Fix the Travis failures in rspec	2017-01-11 10:07:25 +01:00
Ana María Martínez Gómez	7ebf44d1e4	Improvements in the DatabaseCleaner ... Move all what is related to the DatabaseCleaner to the database_cleaner.rb file. Load the seeds only when they have been deleted and not before every test.	2017-01-11 10:03:27 +01:00
AEtherC0r3	ca442dcb90	Amend version tests to show correct event name ... Add scenario for votes	2017-01-10 23:51:32 +02:00
AEtherC0r3	e5687c4504	Find correct event id in versions ... Fixes #1226	2017-01-10 22:07:40 +02:00
AEtherC0r3	e514a8c30a	Adds table header in admin/events#index	2017-01-10 21:30:00 +02:00
Stella Rouzi	052cfebf4e	Merge pull request #1237 from AEtherC0r3/template_subject ... Load subject when loading a temlate	2017-01-10 12:51:10 +02:00
AEtherC0r3	aaa2571eb5	Changes email templates in admin/emails#index ... Styling and readability improvements by using single quotes and expanding hashes to span multiple lines Add subject templates	2017-01-10 12:24:04 +02:00
desantonop	c0b7a70e6e	Load template loads subject ... Change variable names in admin/emails#index to more descriptive ones. Geia soy Stella :* Change attributes "data-name" to "data-body-input-id" and "data-template" to "data-body-text"	2017-01-10 12:24:04 +02:00
Christian Bruckmayer	f67a721f20	Merge pull request #1232 from mwgalloway/error-pages ... Error pages	2017-01-09 17:56:37 +01:00
Christian Bruckmayer	5f080cf6db	Merge pull request #1134 from Ana06/all-events-links ... Make links inside event-panel work with ctrl+click	2017-01-09 17:54:30 +01:00
Christian Bruckmayer	d6618fd3af	Merge pull request #1136 from differentreality/fix_voting ... voting period is open when voting dates are not set	2017-01-09 17:53:18 +01:00
Ana	cf5d4e4dbe	Make links inside event-panel work with ctrl+click ... Function introduce to be used in links inside event-panel to make ctrl + click work.	2016-12-30 13:36:05 +01:00
Christian Bruckmayer	c552d08b8e	Merge pull request #1233 from Ana06/error_schedule ... Avoid a Javascript error when @tag is null	2016-12-21 17:34:22 +01:00
Ana María Martínez Gómez	cc4930c120	Avoid a Javascript error when @tag is null ... As it was pointed out in https://github.com/openSUSE/osem/pull/1142 if @tag is null there is an error in the Console when trying to take the user to the current day and time.	2016-12-21 10:55:56 +01:00
Matthew	f8f109598c	Update 500 error page with custom information ... Updated the 500 error page to include the osem logo, a link to the root directory, a link to Github issues, and contact information.	2016-12-20 16:05:55 -06:00
Matthew	950e4edec1	Add 403 error page ... Created a 403 error page using the same template as the new 404 page. This page includes a link to the root directory, a link to submit a Github issue, and contact information.	2016-12-20 15:58:39 -06:00
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
Christian Bruckmayer	22a3f614a3	Merge pull request #1231 from ChrisBr/open-graph ... Open graph	2016-12-20 16:05:11 +01:00
Sherri Mitchell	06ce06bfb3	Add Open Graph metadata to conference#show	2016-12-20 12:36:01 +01:00
Sherri Mitchell	ee91e72440	Add Open Graph metadata to event#show	2016-12-20 12:35:57 +01:00
Christian Bruckmayer	c4938166f5	Merge pull request #1228 from Ana06/fix_multichoice ... Fix multiple choice questions	2016-12-19 17:40:38 +01:00
Christian Bruckmayer	201fac7088	Merge pull request #1186 from sherrimitchell/event-page-comments ... Adding comments to events#index	2016-12-19 17:24:30 +01:00
Christian Bruckmayer	bb0639df14	Merge pull request #1175 from shlok007/replace-quiet-assets ... using sprockets-rails instead of quiet-assets	2016-12-19 17:14:04 +01:00
Christian Bruckmayer	9a151b60fc	Merge pull request #1152 from ghost/master ... rake task to destroy versions with event_attatchments	2016-12-19 17:11:04 +01:00
Ana María Martínez Gómez	50410f6e4f	Fix multiple choice questions	2016-12-15 11:50:23 +01:00
differentreality	ea868d4cc7	voting period is open when voting dates are not set	2016-11-24 19:09:35 +02: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