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

1972 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rishabh Saxena
211410b6f0 Merge 4d4736f042 into 424b1302cb 2016-08-10 06:18:19 +00:00
Stella Rouzi
424b1302cb Merge pull request #1126 from Ana06/unless 
Do not use unless with else
 2016-08-09 13:21:17 +03: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
Christian Bruckmayer
859b3beda6 Merge pull request #1123 from Ana06/if_not 
style: if ! changed by unless
 2016-08-08 14:07:05 +02:00
Christian Bruckmayer
81ef4f0438 Merge pull request #1112 from Ana06/ability_test 
Creation of my_conference repeated in ability_spec
 2016-08-08 14:05:30 +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
Ana
71b39bb612 creation of my_conference repeated in ability_spec 
my_conference is created several times in ability_spec but it is not necessary.
 2016-07-29 19:58:11 +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
1559b29d2d Rubocop class length increased 
Rubocop class length increased in 5 lines as app/models/conference.rb had too many lines.
 2016-07-25 11:33:30 +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
14b0669f8b Merge pull request #1103 from Ana06/event-serializer-length 
Default value for length in as_json fixed
 2016-07-22 13:23:17 +03: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
Christian Bruckmayer
8388385b51 Merge pull request #1102 from Ana06/unused-css 
unused css removed
 2016-07-15 14:12:54 +02:00
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
9b704e483e modify tests 2016-07-14 19:09:39 +05:30
Rishabh Saxena
a3d709bc75 add helper tests 2016-07-14 19:08:28 +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
Henne Vogelsang
7a95c43a57 Require less variables for heroku. 
Fixes #1095
 2016-07-12 16:28:50 +02:00
Rishabh Saxena
07c9aee7cc remove 'paid' argument in testing function calls 2016-07-11 23:34:02 +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
8b03f1be74 check for other tests 2016-07-11 23:34:01 +05:30
Rishabh Saxena
df4b015c09 replace submit form capybara 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
2e66e5807a check path transition after payment 2016-07-11 23:34:01 +05:30
Rishabh Saxena
58a240a9f2 add tests and repair button click 2016-07-11 23:34:01 +05:30
Rishabh Saxena
99b4d18729 check failing tests 2016-07-11 23:34:01 +05:30
Rishabh Saxena
5b8e7ade2f use select instead of fill_in capybara 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