gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
2285 commits 15 branches 2 tags 50 MiB
Commit graph

2285 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Sherri Mitchell
f8f49ae16d Adding comments to events#index 2016-09-08 14:55:52 -04:00
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
Praveen Kumar
45e53a2ae9 rake task to destroy versions with event_attatchments 2016-08-31 17:24:52 +05:30
shlok007
9ace40d9fc using sprockets-rails instead of quiet-assets 2016-08-27 19:40:53 -04: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
Hernan Schmidt
4d6868d9bb Fix conference serializer spec to work with MySQL 2016-08-18 18:34:50 +02:00
Hernan Schmidt
9eb4ac2738 Fix campaign features to work with MySQL 2016-08-18 18:32:41 +02:00
Hernan Schmidt
686e41c3d0 Fix proposal controller specs to work with MySQL 2016-08-18 18:32:41 +02:00
Hernan Schmidt
a6d4d51b03 Fix model specs to work with MySQL 2016-08-18 18:32:41 +02:00
Hernan Schmidt
baa5894c38 Don't use DBCleaner inside tests 2016-08-18 18:32:41 +02:00
Hernan Schmidt
244172a9bc Clean up DatabaseCleaner usage 2016-08-18 18:32:06 +02:00
Ana
c5c7cbeab9 Delete EventSchedules when a Room is deleted 
We should remove all the EventSchedules that belongs_to a Room when it is deleted. Otherwise both the public and admin schedule would fail.
 2016-08-18 16:19:15 +02:00
Hernán Schmidt
c6be0999b9 Merge pull request #1116 from rishabhs95/payments-documentation 
add documentation for Stripe configuration
 2016-08-18 16:10:35 +02:00
Hernán Schmidt
32019a11e1 Merge pull request #1108 from rishabhs95/stripe 
Online payment feature - direct stripe integration
 2016-08-18 16:04:11 +02:00
Christian Bruckmayer
529cfcf4c7 Merge pull request #1150 from charliequinn/add-specs-for-show-time 
Added specs for ApplicationHelper.show_time
 2016-08-18 14:41:02 +02:00
Rishabh Saxena
2605c8f239 docs/PAYMENTS: add API docs 
docs: remove OSEM_ICON docs
 2016-08-18 15:31:34 +05:30
Rishabh Saxena
4152cb242c run stripe feature test only if key is set 2016-08-17 23:57:40 +05:30
charliequinn
ef9ba3b981 Added specs for ApplicationHelper.show_time 
- refactor of code to use divmod and handle decimal number parameter
- return '0 h 0 min' if length blank
 2016-08-17 13:55:29 +01:00
Christian Bruckmayer
4450202d8d Merge pull request #1137 from arun1595/ichain-documentation 
Update CONTRIBUTING.md to setup ichain in test mode using dotenv
 2016-08-17 14:42:50 +02:00
Rishabh Saxena
cc09dd76ba support/external_request: only allow stripe 2016-08-17 12:25:49 +05:30
Rishabh Saxena
43ac7742a1 travis: provide Stripe API keys 2016-08-16 23:01:28 +05:30