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

1077 commits

Author SHA1 Message Date
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
Aditya Prakash
d662ebd252 Remove sponsorship level from view and test 2016-04-21 21:22:14 +05:30
Shriyansh
f6b5cb03e8 redesigned view of splashpage 2016-04-21 20:21:23 +05:30
Aditya Prakash
8da80f28e2 Add pop up modal for sponsor 2016-04-21 19:51:24 +05:30
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
2e79f65989 Merge pull request #939 from Shriyanshagro/datepicker_constraints 
Defined DateTimepicker constraints
 2016-04-20 16:19:41 +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
Alexandros
b7bba4ba44 Groom proposal#show for issue openSUSE/osem#731 
Move speaker's avatar and bio to the sidebar and move proposal's information bellow the commercial.
 2016-04-15 00:24:18 +03:00
Aditya Prakash
5430510e4c Remove unused model of datatables 
This model is required if we were doing server side processing for
fetching records however, we are not.
If this needs to be set up sometime in future, checkout:
https://datatables.net/examples/server_side/simple.html
 2016-04-10 13:50:18 +05:30
Aditya Prakash
34892d04c8 Remove unused assets of datatables 
jquery-datatables-rails gem provides all these resource.
Remove javascript was unused code since d21e19b9.
 2016-04-10 13:49:46 +05:30
Shriyansh
0ca19ea67a added views for public view on splashpage,venue_edit,venue 2016-04-10 11:57:30 +05:30
Shriyansh
3bcdbe7469 defined ability for user with roles -organizer and cfp's, and some improvements in controller 2016-04-10 11:57:30 +05:30
Shriyansh
5cdedbf9a6 rubocop issues solved 2016-04-10 11:57:30 +05:30
Shriyansh
5186dfcb12 secured Ux 2016-04-10 11:57:30 +05:30
Shriyansh
7bbb0da17a done with creating relationship and generating view for venue_commercials 2016-04-10 11:57:30 +05:30
Shriyansh
dc0da8c500 defined ,tabular form 
defined ,tabular form
 2016-04-10 11:57:30 +05:30
Shriyansh
6f667a865b create_venue_commercial added 2016-04-10 11:57:30 +05:30
Shriyansh
154f4a400c venue_commercial association establihed 2016-04-10 11:57:30 +05:30
Shriyansh
bba9a552ec attributes to send data to datepicker JS has been defined 2016-04-09 21:03:31 +05:30
Shriyansh
b6083d836d defined constraints for dateTimePicker 2016-04-09 21:03:31 +05:30
Stella Rouzi
b9e10922ee drop dietary choices, social events, and html_export_path 2016-04-09 16:29:20 +03:00
Aditya Prakash
282168568a Remove program model from ahoy 
We are not using this anywhere in our codebase.
program model exits at: app/models/program.rb
 2016-04-09 15:01:46 +05:30
Nishanth Vijayan
03fcdecdf2 Fix authorization of adding/removing users from roles 
Only organizers should be able to add/remove users from all roles.
Only organizers should be able to edit/update the description of roles of their conference.
Cfp/info_desk/voluters coordinators should be to able to add/remove users only to their own teams.
 2016-04-09 03:50:27 +05:30
Nishanth Vijayan
ab339fadb0 Fix typos: volunteer_coordinator to volunteers_coordinator 2016-04-09 03:50:27 +05:30
Christian Bruckmayer
86449eea67 Merge pull request #926 from sonalkr132/mailer-tests 
Mailer fixes and tests
 2016-04-08 11:43:03 -06:00
Henne Vogelsang
ad77bea1db Merge pull request #944 from sonalkr132/serializers-test 
Serializers test
 2016-04-05 11:40:26 +02:00
Stella Rouzi
c7576af0ba Merge pull request #934 from nishanthvijayan/remove_call_for_paper 
Remove unused call_for_paper model and controller files
 2016-04-03 12:12:54 +03:00
Aditya Prakash
d752cfdf7e Add conference serializer tests and remove unused functions 2016-04-03 11:21:57 +05:30
Aditya Prakash
0aa36b470e Add Eventserializer tests and fix undefined method `l' for Eventserializer 
Solution of no method error pointed by @nishanthvijayan:
http://stackoverflow.com/a/11724935
 2016-04-03 00:59:28 +05:30
Henne Vogelsang
80f63c7263 Switch back to leaflet-rails 
The rails-assets version has too many issues with the asset pipeline
 2016-04-01 16:15:52 +02:00
Henne Vogelsang
c4e782a90c Merge pull request #931 from nishanthvijayan/fix-api-events-speakers 
Fix api controllers events and speakers
 2016-04-01 15:05:26 +02:00
Henne Vogelsang
5352d52157 Merge pull request #927 from nishanthvijayan/wrong-routes-links 
Fix reference to non-existant route path in commercials_controller
 2016-04-01 15:04:18 +02:00
Henne Vogelsang
5cbf105a68 Merge pull request #920 from camillem/master 
Adding notranslate classes to ease translation of dynamic text
 2016-04-01 14:51:50 +02:00
Henne Vogelsang
f56fc0052f Merge pull request #907 from sonalkr132/proposal-test 
Proposal controller improvements and test
 2016-04-01 14:49:50 +02:00
Nishanth Vijayan
11b96412a0 Remove unused call_for_paper model and controller files 2016-04-01 01:43:06 +05:30
Aditya Prakash
d9db395ec6 Use each to iterate over array in mailer and fix comment link 
*_url gives complete path with host
 2016-03-31 22:59:12 +05:30
Nishanth Vijayan
22714b0f11 Fix api/v1/events and api/v1/speakers controllers 2016-03-31 17:22:12 +05:30
Nishanth Vijayan
bc5c5dd7ca Fix reference to non-existant route path in commercials_controller 2016-03-31 15:57:20 +05:30
Aditya Prakash
c35270ad31 More sane branching in confirm action of proposal controller 2016-03-31 15:45:47 +05:30
Henne Vogelsang
39a850cc39 Merge pull request #918 from matthin/master 
Display roles in registration list
 2016-03-31 12:05:23 +02:00
Aditya Prakash
f4678e5415 Add proposal controller tests 2016-03-30 22:26:52 +05:30
Henne Vogelsang
6aedf2b03d Merge pull request #904 from Shriyanshagro/master 
Made use of Rails I18n data format in EventSerializer #598
 2016-03-30 17:31:42 +02:00
Henne Vogelsang
483f1ccd85 Merge pull request #893 from nishanthvijayan/fix-tooltip-track 
Proposal submitter should be asked to add track only if conf has track
 2016-03-30 17:30:36 +02:00
Henne Vogelsang
1979c0d9c1 Merge pull request #886 from sonalkr132/auth-registration 
Fix authorization of new and create in ConferenceRegistrationsController
 2016-03-30 17:29:10 +02:00
Christian Bruckmayer
4b5fce4203 Merge pull request #925 from davidsf/fix_conf_registration_show 
Fix route link in conference_registration.show
 2016-03-29 10:42:35 -06:00