Ana María Martínez Gómez
24582706be
Merge 37edffe7de into 45c3c73e57
2017-01-26 15:36:04 +00:00
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
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
Stella Rouzi
46101228e7
Merge pull request #1169 from nishanthvijayan/reports
...
Add new page with organizer reports
2017-01-15 12:28:38 +02:00
Ana
37edffe7de
Add validation to avoid overlapping
...
Add validation in EventSchedule to avoid that several event schedules which belongs to the same schedule and room overlap.
2017-01-12 11:52:23 +01:00
Ana
eea35c5578
Avoid overlapping in the admin schedule
...
Not allow that an event is scheduled at the same time than other event in the admin schedule.
2017-01-12 11:52:23 +01:00
Ana
bcff982d3d
Introduce bulk :create, :update and :destroy
...
Introduce bulk :create, :update and :destroy actions to avoid doing several request in the admin schedule.
2017-01-12 11:49:35 +01:00
Ana
10561129f9
Move save button
...
One save button on the top rigth and another one on the bottom of the page.
2017-01-12 11:37:38 +01:00
Ana
6f0cdc64c3
Introduce a "Save" button for the admin schedule
...
The changes were saved after you drop an event, and now it only saves the schedule when you're done with the changes and click the "Save" button.
2017-01-12 11:37:38 +01: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
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
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
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
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
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
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
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
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
Nishanth Vijayan
d954059947
Show missing speakers in reports
2016-09-28 03:03:01 +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
Nishanth Vijayan
fabe29d2ed
Add new page with organizer reports
2016-09-27 21:24:49 +05:30
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
