gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-15 12:44:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1916 commits 15 branches 2 tags 50 MiB
Commit graph

442 commits

Author SHA1 Message Date
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
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
Henne Vogelsang
3391d09549 Use ActiveJob to send comment mails 2016-04-22 11:31:19 +02:00
Aditya Prakash
af08d843a8 Maintain size of sponsor logos 
Places logo on a white background if image is smaller than the given
constrains.
Resizes the logo if image is larger than constrains.
Validation of presence of logo was moved cause file field wasn't getting
marked as required field ('*' thingy) in form.
`- if logo presence` was removed cause logo is mandatory field.
 2016-04-21 19:51:24 +05:30
Christian Bruckmayer
647a40be63 Prettify sponsors section 2016-04-21 19:51:24 +05:30
Henne Vogelsang
2ea7bda639 Use ActiveJob to send venue update mails 2016-04-21 16:03:51 +02:00
Henne Vogelsang
21280cd9d8 Switch mail sending to active_job 
Before we were using the delayed_job method of delaying
mail sending which isn't working anymore on rails 4.
 2016-04-20 18:59:24 +02:00
Henne Vogelsang
14011f8828 Fix email notifications 2016-04-20 16:22:29 +02:00
Aditya Prakash
7e04a267cb Fix get_roles method of User model 
Previous implementation was associating resources with all
the roles regardless of user role in the resource. ie:
if user is cfp member of conf1, the method was returning:
{ organizer => conf1,
  cfp => conf1,
  Info Desk => conf1,
  Volunteers Coordinator => conf1
}
 2016-04-17 14:11:09 +05:30
Aditya Prakash
3c356cbaaf Remove unused functions from user model 
set_up is callback and should be a private method.
removed methods:
* ticket(id) was introduced in 5f8a8ac6, however never used.
* self.prepare(params) only use instance was removed in d21e19b9
* attending_conference?(conference) introduced in merge of person and user model 23bf55b6,
  any previous use instance difficult to find
* biography_word_count: we are using js for this now
* biography_limit only use instance was removed in 23bf55b6
 2016-04-17 12:10:58 +05:30
Henne Vogelsang
0f24a4fa1b Merge pull request #855 from differentreality/refactor_conference_drops 
drop dietary choices, social events, and html_export_path
 2016-04-15 11:43:29 +02:00