Commit graph

1813 commits

Author SHA1 Message Date
Henne Vogelsang
3391d09549 Use ActiveJob to send comment mails 2016-04-22 11:31:19 +02:00
Henne Vogelsang
8392fca0dc Default from in Mailbot was never used 2016-04-22 11:31:15 +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
Henne Vogelsang
37e0b5f5b8 Get rid of build_email
It's always easy to add another layer of indirection...
2016-04-21 16:36:53 +02:00
Henne Vogelsang
a698ce44fe Use ActiveJob to send cfp update mails 2016-04-21 16:26:37 +02:00
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
82e356dde0 Use ActiveJob to send schedule update mails 2016-04-21 16:16:47 +02:00
Henne Vogelsang
2ea7bda639 Use ActiveJob to send venue update mails 2016-04-21 16:03:51 +02:00
Henne Vogelsang
4dd15dc62c Use ActiveJob to send registration period update mails 2016-04-21 16:03:41 +02:00
Henne Vogelsang
e758c30292 Use ActiveJob to send conference date update mails 2016-04-21 15:11:20 +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
Henne Vogelsang
2e79f65989 Merge pull request #939 from Shriyanshagro/datepicker_constraints
Defined DateTimepicker constraints
2016-04-20 16:19:41 +02:00
Henne Vogelsang
cd1dc09573 Merge pull request #963 from sonalkr132/user-tests
Remove unused methods of user model and tests
2016-04-20 15:10:21 +02:00
Henne Vogelsang
3bf7689412 Merge pull request #964 from sonalkr132/remove-limit
Remove limit attribute from schema
2016-04-20 15:07:32 +02:00
Aditya Prakash
d46c3e080f Remove limit attribute from schema
Introduced in https://github.com/openSUSE/osem/pull/820 with no
apparent reason and seems to be env specific of PR submitter.
2016-04-17 15:21:18 +05:30
Aditya Prakash
3bb220d3a9 Add test for user model
bang(!) was removed cause it was not needed and slowing single
test runs
2016-04-17 15:15:33 +05:30
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
Henne Vogelsang
47bc3c7354 Merge pull request #960 from alexdor/proposal_page_formating
Groom proposal#show based on issue #731
2016-04-15 11:41:50 +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
Henne Vogelsang
ea76d93ecf Merge pull request #953 from sonalkr132/datatable-cleanup
Datatable cleanup
2016-04-12 17:56:28 +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
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
6e33d27a7b changed db/schema 2016-04-09 16:29:20 +03:00
Stella Rouzi
b9e10922ee drop dietary choices, social events, and html_export_path 2016-04-09 16:29:20 +03:00
Stella Rouzi
1fdd029a86 Merge pull request #952 from sonalkr132/remove-ahoy-program
Remove program model from ahoy
2016-04-09 16:25:17 +03:00
Nishanth Vijayan
90d978f588 Improve ability test to test roles authorization 2016-04-09 17:43:42 +05:30
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
Christian Bruckmayer
00d6382ffa Merge pull request #949 from sonalkr132/documentation
Documentation of use of ichain and smtp settings
2016-04-08 11:12:04 -06:00
Christian Bruckmayer
ecac90c268 Merge pull request #950 from sonalkr132/confirmation-test
Add devise confirmation controller test
2016-04-08 11:09:00 -06:00
Aditya Prakash
35935fb726 Add devise confirmation controller test 2016-04-07 17:34:23 +05:30
Aditya Prakash
9abda59b0d Add configuration and documentation smtp setting 2016-04-07 13:49:28 +05:30