Siddhant Bajaj
0295850f20
Mock request to fix factory girl rake
2017-02-21 14:44:52 +05:30
Siddhant Bajaj
1255088ff0
fixed travis issues
2017-02-20 23:43:02 +05:30
Ana María Martínez Gómez
945b4aac60
Merge pull request #1249 from commandprompt/configurable_schedules
...
implements configurable schedule granularity
2017-02-01 15:41:28 +01:00
Eugene Dubinin
ff9ca4a817
implements configurable schedule granularity and improves the schedule grid for denser schedule grids on smaller screens
2017-01-31 16:24:45 +02:00
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
Ana María Martínez Gómez
4089f16f17
Merge pull request #1253 from differentreality/1113
...
Rebases #1113
2017-01-31 10:08:38 +01:00
Rishabh Saxena
241bc89293
repair code reviews
2017-01-29 10:50:43 +05:30
Ana María Martínez Gómez
45c3c73e57
Merge pull request #1255 from shlok007/display-paid-and-unpaid-tickets
...
Display paid and unpaid tickets in admin/tickets#show
2017-01-26 16:27:24 +01:00
shlok007
d974807134
Display paid and unpaid tickets in admin/tickets#show
2017-01-23 22:37:57 +05:30
Nishanth Vijayan
5111d9e937
Extract checking if event is replacement to event_schedule model
2017-01-20 18:54:56 +02:00
Nishanth Vijayan
9c7591adcd
Add cancel/replacement labels in All Events
...
Extract replacement/canceled label & notice logic to helpers
Join replacement/canceled label and notice and move to top
2017-01-20 18:54:35 +02:00
Stella Rouzi
2a0e1b5dea
Merge pull request #1251 from Ana06/schedule-bug
...
Fix bug in the schedule
2017-01-19 12:21:21 +02:00
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
Rishabh Saxena
e0d5b461b3
rubocop: annotate exceptions
2016-12-20 17:21:50 +05:30
Rishabh Saxena
b1826a1abc
rubocop: ignore conference class length warning
2016-12-20 17:21:50 +05:30
Rishabh Saxena
b9b7a4d97d
remove tickets testing ambiguity
2016-12-20 17:21:50 +05:30
Rishabh Saxena
fe828d24db
conference: refactor code and tests
2016-12-20 17:21:50 +05:30
Rishabh Saxena
53291e25b5
automatically create free ticket with new conf
2016-12-20 17:21:49 +05:30
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
Rishabh Saxena
b28be23284
spec/ticket: add tests for purchasing free tickets
2016-12-20 17:21:49 +05:30
Rishabh Saxena
b2f75dd907
spec/tickets: add tests for free ticket creation
2016-12-20 17:21:49 +05:30
Rishabh Saxena
4dcfc55418
add ability to create and purchase free tickets
2016-12-20 17:21:48 +05:30
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
