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
1692 commits 15 branches 2 tags 50 MiB
Commit graph

1692 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Aditya Prakash
d770533bdc Add documentation for using ichain in test mode 
Removed houndp-ci because we are not using it anymore.
Removed private links. Ex: [OSEM-admins](https://github.com/orgs/openSUSE/teams/osem-admins)
is accessible only to members ot osem-admins team.
 2016-04-07 11:17:37 +05:30
Christian Bruckmayer
2d3ea22fd3 Merge pull request #947 from hennevogel/update_gems 
Switch to trusty as base OS
 2016-04-06 09:08:42 -06:00
Henne Vogelsang
be42215003 phantomjs doesn't like color pickers... 2016-04-05 14:45:47 +02:00
Henne Vogelsang
7b40f3ceb6 Update poltergeist 2016-04-05 13:43:52 +02:00
Henne Vogelsang
a79193f7af Switch to ruby 2.2.3 2016-04-05 13:43:52 +02:00
Henne Vogelsang
779004e7e3 Switch travis to trusty builds 
https://docs.travis-ci.com/user/trusty-ci-environment/
 2016-04-05 13:43:52 +02:00
Henne Vogelsang
fa8d0a993c Update phantomjs to latest version 2016-04-05 13:43:52 +02:00
Henne Vogelsang
39746fe847 Merge pull request #940 from nishanthvijayan/api-conference-test 
Add tests for api/v1/conferences_controller
 2016-04-05 11:46:31 +02:00
Henne Vogelsang
ad77bea1db Merge pull request #944 from sonalkr132/serializers-test 
Serializers test
 2016-04-05 11:40:26 +02:00
Nishanth Vijayan
5587f1dc14 Add tests for api/v1/conferences_controller 2016-04-03 16:02:34 +05:30
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
ca4ca21fdf Add SpeakerSerializer tests 2016-04-03 00:59:30 +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
Aditya Prakash
a786321800 Add room and track serilizer tests 2016-04-02 21:00:29 +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
c8481aef5d Merge pull request #936 from sonalkr132/hakiri-fix 
Update for security warning on hakiri
 2016-04-01 15:15:02 +02:00
Henne Vogelsang
7acd5d66e7 Merge pull request #935 from sonalkr132/update-simplecov 
Update coverall to 0.8.13
 2016-04-01 15:14:36 +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