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

408 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Nishanth Vijayan
48b48e88ac Add before_destroy :cancel to precent role destroy.Change Conference-Role association to have dependent: :destroy_all 2016-03-28 19:49:59 +05:30
Aditya Prakash
e851c0b4ff Add authorization rule for create user by unsigned user 
Add authorization to failed user save path cause it was complaining
that no authorization was performed in that path.
 2016-03-24 17:42:00 +05:30
Nishanth Vijayan
246bf605ea Proposal submitter should be asked to add track only if conf has track 2016-03-23 23:31:00 +05:30
Aditya Prakash
eae6d90e9f Fix authorization of new and create in ConferenceRegistrationsController 
Before authorization we need to set conference relation.
Change in proposal spec cause conference has to have valid registration
period for successful redirect to registration after confirm proposal.
 2016-03-23 21:30:05 +05:30
Henne Vogelsang
10ef898a0d Merge pull request #872 from sonalkr132/proposal-after-cfp 
Allow submission of proposal only if program has cfp
 2016-03-23 16:34:12 +01:00
Christian Bruckmayer
a9fb07cadb Merge pull request #889 from rishabhs95/admin-tickets-view 
correcting ticket's details view for admin.
 2016-03-18 14:34:24 -06:00
Rishabh Saxena
99afc456cd correcting ticket's details view and its related models. 2016-03-19 01:52:38 +05:30
Christian Bruckmayer
3ad009658d Merge pull request #836 from davidsf/fix_email_send 
Fix send emails because missing event program relation.
 2016-03-18 11:18:59 -06:00
Aditya Prakash
3e32c58460 Allow submission of proposal only if program has cfp 2016-03-18 09:18:05 +05:30
Christian Bruckmayer
9e67a1bcd5 Merge pull request #876 from rishabhs95/delete-tickets-unregistered 
Destroying tickets belonging to a user after user unregisters from a conference
 2016-03-16 12:54:21 -06:00
Rishabh Saxena
8334619029 callback for destroying registration and writing tests for it 
writing tests for deleting tickets after unregistering

removing code duplication in tests
 2016-03-16 23:31:57 +05:30
Ana
922e94649d overriding the #name attribute 2016-03-10 22:49:54 +01:00
Christian Bruckmayer
a6c89351c5 Make Comment find_since_last_login scope robust against nil value 
to fix production ArgumentError: bad value for range. Fixes #807.
 2016-03-10 15:04:14 +01:00
Christian Bruckmayer
55ab8a8e8f Set sign_in attributes on iChain login 
Set last_sign_in_at and current_sign_in_at attributes when iChain login is enabled. #807
 2016-03-10 15:04:02 +01:00
Henne Vogelsang
0df693ffbf Merge pull request #820 from differentreality/update_rolify 
update rolify
 2016-03-09 11:32:52 +01:00
Stella Rouzi
782a1f071f Merge pull request #801 from sonalkr132/targets_test 
Model and controller tests for Target
 2016-03-09 12:13:53 +02:00
Stella Rouzi
e560d263c9 Merge pull request #838 from sonalkr132/ticket-tests 
Tests for ticket model
 2016-03-09 12:03:52 +02:00
Stella Rouzi
40a48e1e7e Update rolify and cancancan 2016-03-07 23:32:15 +02:00
Christian Bruckmayer
9fbd2e9618 Merge pull request #827 from hennevogel/feature-proposal_for_track 
Feature: Add/change Track for Event
 2016-03-07 17:12:33 +01:00