Commit graph

4833 commits

Author SHA1 Message Date
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
Nishanth Vijayan
e2659ae907 Show changes to event commercials in event changelog 2016-08-15 18:18:03 +05:30
Nishanth Vijayan
da1c8fc691 Allow cfp team members to revert changes to events through event#history-content 2016-08-15 18:18:03 +05:30
Nishanth Vijayan
0a3466ca7c Move shared version partials to views/shared 2016-08-15 18:17:59 +05:30
Nishanth Vijayan
c80f37f3ff Change look of event history page similar to changelog 2016-08-15 16:48:10 +05:30
Stella Rouzi
86ba2d005e Merge pull request #1019 from nishanthvijayan/changelog
Changelog/Revision History page
2016-08-15 14:16:12 +03:00
Rishabh Saxena
4147114e02 add test card docs 2016-08-15 11:00:47 +05:30
Rishabh Saxena
4509bf09bb add email-invoice documentation.
correct language errors.
2016-08-15 11:00:46 +05:30
Rishabh Saxena
f40caa8b24 improve documentation 2016-08-15 11:00:46 +05:30
Rishabh Saxena
c8b3b95d74 add documentation for Stripe configuration 2016-08-15 11:00:46 +05:30
Rishabh Saxena
164101f2fe change "purchase" to "get" in views 2016-08-15 10:59:36 +05:30
Rishabh Saxena
6aecf2d446 modify conference registration view message 2016-08-15 10:59:36 +05:30
Rishabh Saxena
261d7dd0de improve flash error collection
improve views
2016-08-15 10:59:36 +05:30
Rishabh Saxena
6bd2e5e335 refactor tests 2016-08-15 10:59:36 +05:30
Rishabh Saxena
a78804b94d add more tests to check Stripe exceptions 2016-08-15 10:59:36 +05:30
Rishabh Saxena
922440fb77 improve payment view styling 2016-08-15 10:59:35 +05:30
Rishabh Saxena
5c21d1c4d9 add Payment#purchase tests 2016-08-15 10:59:35 +05:30
Rishabh Saxena
4b0a5b1125 move params merge to private method 2016-08-15 10:59:35 +05:30
Rishabh Saxena
05e2a061cc add stripe key to development env 2016-08-15 10:59:35 +05:30
Rishabh Saxena
048f20bcfc fix typo. change secrets.yml config. 2016-08-15 10:59:35 +05:30
Rishabh Saxena
a9ab1186f8 change rails initialisation.
repair abilities. add ticket purchasing check.
2016-08-15 10:59:35 +05:30
Rishabh Saxena
72ef33cbe6 remove stripe#customer creation.
remove amount validation.
2016-08-15 10:59:35 +05:30
Rishabh Saxena
112d2c6fff change camel case variable to ruby style. 2016-08-15 10:59:35 +05:30
Rishabh Saxena
1f9338735c improve Stripe error rescue. modify tests. 2016-08-15 10:59:34 +05:30
Rishabh Saxena
52c30af642 generalise application icon for Stripe iFrame 2016-08-15 10:59:34 +05:30
Rishabh Saxena
be6d046154 move stripe API call to model, schema changes 2016-08-15 10:59:34 +05:30
Rishabh Saxena
47e16e5653 add stripe gateway config 2016-08-15 10:59:34 +05:30
Rishabh Saxena
7b23018a06 add payment tests 2016-08-15 10:59:34 +05:30
Rishabh Saxena
a5bb038f61 modify tests for changed payment flow 2016-08-15 10:59:34 +05:30
Rishabh Saxena
ab262ecb46 add payment views and styling 2016-08-15 10:59:34 +05:30
Rishabh Saxena
e2d42fbbbb modify ticket and ticket_purchases models 2016-08-15 10:59:34 +05:30
Rishabh Saxena
1894cea975 modify ticket purchases view 2016-08-15 10:59:33 +05:30
Rishabh Saxena
92dc0edff2 modify registration view and controller 2016-08-15 10:59:33 +05:30
Rishabh Saxena
8f39fc83d2 add resource, ability and controller for payments 2016-08-15 10:59:33 +05:30
Rishabh Saxena
ee0a575a6f add payment model and its associations 2016-08-15 10:59:33 +05:30
Rishabh Saxena
b639d2eec5 add stripe-gem and payment schema 2016-08-15 10:59:33 +05:30
Henne Vogelsang
2b4bf2fff7 Merge pull request #1138 from charliequinn/increase-tests-conference-registrations-controller
Specs added ConferenceRegistrationsController#new
2016-08-12 13:42:24 +02:00
Christian Bruckmayer
308c15f0ff Merge pull request #1127 from Ana06/markdown
Markdown
2016-08-12 11:55:05 +02:00
Christian Bruckmayer
72531c799a Merge pull request #1125 from Ana06/schedule-tags
Schedule tags improved
2016-08-12 11:53:05 +02:00
Christian Bruckmayer
56f09474eb Merge pull request #1104 from Ana06/integrate-schedule
Inform that there are no rooms in the schedule
2016-08-12 11:49:46 +02:00
Ana
eee4e4f22c Add markdown to users biography
Closes https://github.com/openSUSE/osem/issues/1090
Closes https://github.com/openSUSE/osem/issues/701
2016-08-12 11:38:28 +02:00
Ana
72cd463dc7 Add markdown to events abstract 2016-08-12 11:38:28 +02:00