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
2074 commits 15 branches 2 tags 50 MiB
Commit graph

2074 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Stella Rouzi
99992750bb Merge pull request #1128 from nishanthvijayan/event-changelog 
Improve event history page
 2016-08-16 18:23:56 +03:00
Nishanth Vijayan
a02060b665 cfp team users should have access to event commercials only 2016-08-16 18:56:54 +05:30
Stella Rouzi
10121ae6d0 Merge pull request #1110 from jmks/ichain-signin-page-layout 
Updated layout of ichain sign in page
 2016-08-16 13:48:57 +03:00
Stella Rouzi
9c5fd18c3e Merge pull request #1097 from shlok007/manual_confirmation 
Ability to confirm users by admin
 2016-08-16 13:43:27 +03:00
Christian Bruckmayer
3e2b2f3678 Merge pull request #1149 from charliequinn/allow-nil-value-in-markdown-1145 
Bug fix nil parameter ApplicationHelper.markdown
 2016-08-16 09:47:48 +02:00
shlok007
c50e8c0466 Implemented ability of admins to manually confirm users 2016-08-16 02:23:41 -04:00
charliequinn
89d45f62a0 Bug fix nil parameter ApplicationHelper.markdown 
Added specs for nil value parameter and header markdown
 2016-08-16 00:33:32 +01:00
Rishabh Saxena
75e11223d2 spec/feature: add stripe integration tests 2016-08-16 00:46:11 +05:30
Rishabh Saxena
060d65c430 views/_payment: decrease script indentation 2016-08-16 00:43:48 +05:30
Christian Bruckmayer
6c2dc92b84 Merge pull request #1148 from Ana06/event-schedule-validation 
Validation in EventSchedule
 2016-08-15 16:28:39 +02:00
Ana
f0a7f3c59b Validation in EventSchedule 
Validation to avoid scheduling the same event twice for the same schedule.
 2016-08-15 16:10:57 +02:00