gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1941 commits 2 branches 2 tags 50 MiB
Commit graph

1198 commits

Author SHA1 Message Date
Rishabh Saxena
f00e051eff refactor payment#purchase method, improve environment variable names 2016-07-21 10:15:17 +05:30
Rishabh Saxena
c4d934d711 refactor payment model and its tests 2016-07-19 12:40:16 +05:30
Rishabh Saxena
25c0046290 repair code reviews, improve environment configs 2016-07-18 12:04:10 +05:30
Rishabh Saxena
223a0eead9 delete unused methods, add feature tests 2016-07-15 02:46:31 +05:30
Rishabh Saxena
3b4c7d70c0 remove card_types from helpers 2016-07-14 22:20:31 +05:30
Rishabh Saxena
ae44abc7e6 solve code reviews, resolve rebase conflicts 2016-07-14 19:10:33 +05:30
Rishabh Saxena
888c7a8524 use short-form presence validator. 
use two-argument form.
add unpaid scope.
repair tests.
 2016-07-11 23:34:02 +05:30
Rishabh Saxena
893f517ab0 pass paid value as hash, improve code reviews 2016-07-11 23:34:01 +05:30
Rishabh Saxena
e31ca46f87 submit form directly in tests 2016-07-11 23:34:01 +05:30
Rishabh Saxena
1af6fa5ad1 add id to inputs and repair tests 2016-07-11 23:34:01 +05:30
Rishabh Saxena
c57a8a1d00 repair tests and move method belonging to controller 2016-07-11 23:34:00 +05:30
Rishabh Saxena
38ae24c6b3 add more tests 2016-07-11 23:34:00 +05:30
Rishabh Saxena
c0c84b9dbf add more explanatory true/false values 2016-07-11 23:34:00 +05:30
Rishabh Saxena
f202c6b93b repairing code reviews 2016-07-11 23:34:00 +05:30
Rishabh Saxena
b202984fa9 update ticket purchase and conference registration views for new structure 2016-07-11 23:32:41 +05:30
Rishabh Saxena
14594c7a4d add payment views, styling and its helper methods 2016-07-11 23:31:13 +05:30
Rishabh Saxena
81ef41be8b modify controllers and models to just save paid ticket purchases 2016-07-11 23:31:13 +05:30
Rishabh Saxena
900a1b32a8 add payment resources, controllers and method for updating purchased ticket's parameters 2016-07-11 23:24:53 +05:30
Rishabh Saxena
36f2cf4373 add payment model and its associations 2016-07-11 23:24:52 +05:30
Ana
feb002de1a Text color of event types and difficulty levels 
Changing the text color of event types and difficulty levels taking the background color into account. Similar to what it is done with tracks. See issue https://github.com/openSUSE/osem/issues/1033

Closes https://github.com/openSUSE/osem/issues/1078
 2016-07-11 15:32:02 +02:00
Christian Bruckmayer
28f0973fc4 Merge pull request #1079 from Ana06/suggest_track_color 
Different colors for new tracks, types and levels
 2016-07-11 15:10:26 +02:00
Ana
8d9bb56f06 Hexadecimal color changed to capital letters 
The default colors in event_types and difficulty levels are in capital letters and the ones that comes from the color picker were not. Now colors are capitalized before saving the track, level or type. A rake task has also been created to capitalize color from old tracks, levels or types.
 2016-07-11 13:46:02 +02:00
Ana
0deaf1abc7 Different colors for new tracks, types and levels 
Every time a new track, event type or difficulty level is created, the color picker has a different color by default.

Closes https://github.com/openSUSE/osem/issues/1077
 2016-07-11 13:46:01 +02:00
Stella Rouzi
eb312f139e Merge pull request #1084 from arun1595/define-singular-resource 
Modify conference registration to a singular resource
 2016-07-11 13:40:56 +03:00
Ana
9d4a82b062 Name validation repeated in Track 
The validation to check that the name is present in track.rb is twice.
 2016-07-05 10:13:41 +02:00
Arun Kumar
0675572e05
Modify conference registration to a singular resource 2016-07-05 01:15:32 +05:30
Henne Vogelsang
8b831b1977 Merge pull request #1070 from Ana06/style 
unnecessary %div deleted
 2016-07-01 14:52:36 +02:00
Daniel Molkentin
2b43b348cd Use relative URL when loading OSM tiles 
This avoids mixed content warnings and gives us our
padlock back on Chromium and Firefox.

This also switches the domain for the tile servers from osm.org to
openstreetmap.org because the certificates do not mention osm.org
and hence using this domain the tiles fail to load.
 2016-07-01 14:27:32 +02:00
Ana
c1ce420c5d unnecessary %div deleted 
unnecessary %div deleted from haml files as div is the default
 2016-06-30 21:01:06 +02:00
Henne Vogelsang
ff025a4839 Fix the venue display on splash 2016-06-30 17:31:11 +02:00
Henne Vogelsang
5a0328842e Merge branch 'venue-splash-page' of https://github.com/arun1595/osem into arun1595-venue-splash-page 2016-06-30 13:04:28 +02:00
Henne Vogelsang
cdaefee323 Merge pull request #1065 from shyukri/scheduling_default_timezone 
Scheduling new conference: use default Time.zone.now instead of the 1…
 2016-06-30 12:43:47 +02:00
Henne Vogelsang
5d5ad9348c Merge pull request #1034 from Ana06/statistic 
Statistics
 2016-06-30 12:25:59 +02:00
Henne Vogelsang
92e9043a57 Merge pull request #1030 from Ana06/public-schedule 
New schedule
 2016-06-30 12:13:51 +02:00
Shyukri Shyukriev
118f8f416d Scheduling new conference: use default Time.zone.now instead of the 1st available option which was American Samoa. Should fix issue#1064. 2016-06-29 12:38:27 +02:00
Ana
028d430885 Schedule height fits a 600px screen and the schedule is hiden if there is only one room 2016-06-27 18:24:47 +02:00
Ana
82c2c400b6 Swipe support added to the carousel 2016-06-27 18:16:13 +02:00
Ana
53b02d6a74 Adapting number of columns in the carousel schedule taking screen width into account 2016-06-27 18:16:13 +02:00
Ana
d8f9de9363 new schedule 2016-06-27 18:16:13 +02:00
Ana
866e58b5bf registration_limit check moved to ability file 2016-06-27 18:11:21 +02:00
Henne Vogelsang
69a0d12793 Merge pull request #1044 from Ana06/tracks-color 
Changing the text color of tracks taking the background color into account
 2016-06-26 12:34:10 +02:00
Ana
460d117d7a making next_color function more readable 2016-06-25 15:36:43 +02:00
Ana
1d7f3207a6 Registrations dashbox eliminated from registrations 2016-06-25 15:36:33 +02:00
Ana
62c3ee1631 Statistics on top of Registrations#index 2016-06-25 14:39:45 +02:00
Ana
f5701f2e77 Statistics on top of Events#index 2016-06-25 14:39:45 +02:00
Nishanth Vijayan
7a7a58ebf8 Remove unused columns from Conferences,Venues,Events and Sponsors tables 2016-06-25 00:27:25 +05:30
Henne Vogelsang
f5e52e3855 Merge pull request #1051 from differentreality/xml_sort 
Order events by date for XML export
 2016-06-23 11:57:52 +02:00
Stella Rouzi
b0ffa683dc Show most recent conference first in conferences#index 2016-06-23 12:25:39 +03:00
Stella Rouzi
c1205c6387 Order events by date 2016-06-22 16:09:17 +03:00
Arun
a56b992905 Make thumbnails responsive 2016-06-22 04:36:56 +05:30