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
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
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
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
c4366b102a
Add another place where rails is called without a full path to the binary
2016-09-17 19:34:25 -07:00
Rob Smith
6f260d14fa
Fix shared directory mounting on provisioning
...
Due to how the opensuse/openSUSE-42.1-x86_64 box is, there is no vagrant group
by default. When the shared folder is attemtped to mount, it fails with the
following
```
==> default: Mounting shared folders...
default: /vagrant => /Users/kormoc/Projects/osem
Vagrant was unable to mount VirtualBox shared folders. This is usually
because the filesystem "vboxsf" is not available. This filesystem is
made available via the VirtualBox Guest Additions and kernel module.
Please verify that these guest additions are properly installed in the
guest. This is not a bug in Vagrant and is usually caused by a faulty
Vagrant box. For context, the command attemped was:
set -e
mount -t vboxsf -o uid=`id -u vagrant`,gid=`getent group vagrant | cut -d: -f3` vagrant /vagrant
mount -t vboxsf -o uid=`id -u vagrant`,gid=`id -g vagrant` vagrant /vagrant
The error output from the command was:
No such file or directory
```
This change will fix this issue to allow a single `vagrant up` to work correctly
To test this, you can run `vagrant destroy;vagrant up`. This will destroy your current environment and rebuild it from scratch.
2016-09-17 19:31:59 -07:00
Rob Smith
0dba45909f
Minor Contributing documentation updates.
...
These are small things I had to change to have the vagrant environtment work
correctly.
2016-09-17 19:31:59 -07:00
