Commit graph

451 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Ana
460d117d7a making next_color function more readable 2016-06-25 15:36:43 +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
Stella Rouzi
15076b11f1 XML export fix tests. Add not nil room for scheduled events. 2016-06-20 21:05:08 +03:00
Henne Vogelsang
dcae196d2b Merge pull request #905 from Ana06/languages
Languages
2016-06-15 16:55:12 +02:00
Ana
6c87995050 Configure language of events 2016-06-03 14:09:37 +02:00
Ana
55c41810b2 Limit event types lenght 2016-05-31 16:51:12 +02:00
Henne Vogelsang
81ddb76c24 Merge pull request #994 from differentreality/allow_nil_max_attendees
allow max_attendees to be nil
2016-05-19 12:03:43 +02:00
Christian Bruckmayer
406e37a1d8 Adapt ability to allow proposal creation if cfp is open
This was not possible before when iChain was enabled.
- Initialize @event object now with load_and_autorize before filter
- Remove not necessary event_users initilization in :new action
- Adapt ability and feature tests
2016-05-19 11:47:41 +02:00
Stella Rouzi
528243c8b9 Allow max_attendees to be nil 2016-05-15 14:01:36 +03:00
Henne Vogelsang
4d38305110 Program<->cfp is already a one to one relation 2016-05-02 16:06:32 +02:00
Henne Vogelsang
77e0340387 Make use of fake data in factories 2016-05-02 16:06:27 +02:00
Henne Vogelsang
ebcb2780cd Configure OSEM via environment variables
Instead of reading a yaml file we get configuration from the
environment.
2016-04-29 16:36:47 +02:00
Henne Vogelsang
2a4de3e869 Use PictureUploader on Venue 2016-04-27 17:55:17 +02:00
Henne Vogelsang
f1f5fc1cd4 Use PictureUploader on Sponsor 2016-04-27 17:40:23 +02:00
Henne Vogelsang
0ad3ff01c3 Use PictureUploader on Lodging 2016-04-27 17:40:23 +02:00
Henne Vogelsang
40023044af Use PictureUploader on Conference 2016-04-27 17:40:23 +02:00
Henne Vogelsang
ae55c2772f Remove danging :photos table and other photo cruft 2016-04-27 17:40:18 +02:00
Ana
a30893fae3 test I removed accidentally while rebasing restored 2016-04-27 00:41:40 +02:00
Ana
22916971c7 Word limit on user biography changes 2016-04-27 00:28:31 +02:00
Ana
5c044a801d Word limit on user biography 2016-04-27 00:27:44 +02:00
Stella Rouzi
01ec43e53a Registration for Events 2016-04-26 16:11:40 +03:00
Henne Vogelsang
aabbd35063 Merge pull request #932 from hennevogel/bugfix_email_settings
Fix email notifications
2016-04-26 14:33:43 +02:00
Henne Vogelsang
1fdc2f8efe Merge pull request #946 from Shriyanshagro/venue_commercial
Defined Venue has_one Commercial nice new relationship
2016-04-26 14:32:54 +02:00
Henne Vogelsang
9e07212cb5 Merge pull request #967 from sonalkr132/sponsers
Splash page sponsers section style improvement
2016-04-26 14:31:48 +02:00
Stella Rouzi
0a5ba7a204 Merge pull request #942 from nishanthvijayan/fix-roles-authorization
Fix authorization issues with Roles
2016-04-25 17:18:24 +02:00