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

1221 commits

Author SHA1 Message Date
Rishabh Saxena
211410b6f0 Merge 4d4736f042 into 424b1302cb 2016-08-10 06:18:19 +00:00
Ana
c1334e59cc Do not use unless with else 
Solve Rubocop offense introduced in https://github.com/openSUSE/osem/pull/1123
 2016-08-08 23:57:03 +02:00
Ana
7e5d20c89d style: if ! changed by unless 
- if ! changed by unless as it is more readable
- !object.blank? is equivalent to object.present?, also more readable
 2016-08-06 00:57:07 +02:00
Henne Vogelsang
96155eb87f Merge pull request #1082 from nishanthvijayan/handle-cancelled-events 
Handle cancellation of scheduled events
 2016-07-25 15:52:53 +02:00
Henne Vogelsang
5edc6123f4 Merge pull request #987 from differentreality/blind_voting 
Blind voting
 2016-07-25 15:49:01 +02:00
Nishanth Vijayan
a071d4497b Handle cancelation of scheduled events 2016-07-25 17:34:06 +05:30
Henne Vogelsang
63750345e7 Merge pull request #1032 from Ana06/all-events 
All events grouped by date and time
 2016-07-25 11:47:28 +02:00
Ana
bf7f5ce09f The schedule takes you to the current day and time 
The schedule takes you to the current day and time in case that the current date belongs to the conference schedule.

Closes https://github.com/openSUSE/osem/issues/1057
 2016-07-25 11:33:30 +02:00
Ana
39c4261859 All events takes you to the current day 2016-07-25 11:33:30 +02:00
Ana
6d9eabcc0e All events moved to a different controller method 
All events moved to a different controller method and css changed to put together things with the same css attributes.
 2016-07-25 11:33:30 +02:00
Ana
24364d0136 _all_events hamlfy 
_all_events changed to haml and margins moved inside the content of bootstrat cols
 2016-07-25 11:33:29 +02:00
Ana
6f20031bc1 _carousel hamlfy 
carousel changed to haml
 2016-07-25 11:33:29 +02:00
Ana
cd32ddd422 _schedule hamlfy 
_schedule changed to haml
 2016-07-25 11:33:29 +02:00
Ana
818c55df5a Tracks color in all events takes background into account. 
It uses https://github.com/openSUSE/osem/pull/1044 to select black or white color for the track text depending on what of them contrast more with the track background.
 2016-07-25 11:33:28 +02:00
Ana
70f30fcb1f Dropdown with date tags in all events 
Dropdown with date tags in all events of the schedule
 2016-07-25 11:33:28 +02:00
Ana
cc031b9f3a Unscheduled events added to all events 
Unscheduled events added to all events of the schedule
 2016-07-25 11:33:28 +02:00
Ana
69043e1549 All events grouped by date and time 
The events are ordered by date and time in the all events section of the schedule. The event schdule definition in program has been changed to order the events.
 2016-07-25 11:33:25 +02:00
Stella Rouzi
59eeb7edbd Enable blind voting 2016-07-22 12:21:54 +03:00
Rishabh Saxena
4d4736f042 repair tests 2016-07-22 01:15:22 +05:30
Rishabh Saxena
851b467235 payment view improvement 2016-07-22 00:08:56 +05:30
Rishabh Saxena
6d8605073f use full_name instead of first and last name, test changes, schema improvements 2016-07-21 22:53:20 +05:30
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
Ana
a0fc9dd950 Default value for length in as_json fixed 
The default value for length in as_json should be a multiple of EventType::LENGTH_STEP.
 2016-07-18 11:45:59 +02:00
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
Ana
540e19e015 unused css removed 
osem-admin was not included in application.css neither in any other place, so it is not used. Some .css from osem-schedule-print do no exit since we merged https://github.com/openSUSE/osem/pull/1030
 2016-07-14 12:31:04 +02:00
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