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

1272 commits

Author SHA1 Message Date
Hernan Schmidt
9eb4ac2738 Fix campaign features to work with MySQL 2016-08-18 18:32:41 +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
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
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
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
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
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
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
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
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
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
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
Ana
1636b458ee Inform that there are no rooms in the schedule 
Inform that there are no rooms when creating the schedule with a message instead of creating a room with the title "No rooms". The message also include a link to the place where rooms are created.
 2016-08-12 11:33:49 +02:00
Nishanth Vijayan
a45e537bac Setup basic Revision History page 
Sets up paper_trail tracking in important models

and add conference_id to versions for storing conference_id
of conference related objects  as metadata.This will help in querying
for versions related to conferences.

Fix issues with factories & event types initialization.Import paper_trail testing helpers
Fix bug: Creating an event creates a useless version with event update

Add revert and view changes features to revision history
 2016-08-12 13:35:56 +05:30
Christian Bruckmayer
3b1a474ee0 Merge pull request #1094 from Ana06/schedule-versioning 
Schedule versioning
 2016-08-12 09:56:31 +02:00
Ana
d1392c1cba Restore css removed 
Restore css which was removed in https://github.com/openSUSE/osem/pull/1132 as it is used in the public schedule.
 2016-08-12 01:23:54 +02:00
jmks
49121873c1 Replaced double quotes with single 2016-08-11 10:33:16 -04:00
Ana
0e9b8b598f Use jquery-ui-rails gem 2016-08-11 15:11:27 +02:00
Ana
aebd5f20a1 Remove unnecessary attributes in osem-schedule.js 
Remove unnecessary attributes (schedule and event id) in osem-schedule.js used for update an event.
 2016-08-11 15:11:27 +02:00
Ana
a1c7f67735 Render errors in JSON in the schedule correctly 2016-08-11 15:11:27 +02:00
Ana
e8261d41bc Improve Error messages 
- Improve error messages in event schedules, schedules and program controller.
- Two respond_to blocks in the update method of program controller.
 2016-08-11 15:11:27 +02:00