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
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
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
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
Shriyansh
0ca19ea67a
added views for public view on splashpage,venue_edit,venue
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
bba9a552ec
attributes to send data to datepicker JS has been defined
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
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
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
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
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
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
39a850cc39
Merge pull request #918 from matthin/master
...
Display roles in registration list
2016-03-31 12:05:23 +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
Justin Harrison
18b1ad2b70
More efficient listing of roles
...
Reduces number of loops from 2 to 1.
2016-03-29 12:04:48 -04:00
David Sedeño
adf7e0149a
Fix conference program proposal link in conference_registration.show. fix #924
2016-03-28 23:18:35 +02:00
CamilleM
c5da563a48
Merge branch 'master' of https://github.com/camillem/osem
2016-03-26 23:37:35 +01:00
CamilleM
d11ea33cf0
Adding .notranslate classes to haml files to have transifex better handling dynamic text. See issue #908
2016-03-26 23:32:43 +01:00
Justin Harrison
7c38622e8f
Display roles in registration list
2016-03-26 13:25:54 -04:00
Aditya Prakash
dcb98c49f9
Improvements in proposal controller
...
`if..else` is better than unless with return.
On failed update render `edit` template and not render `new` template.
On failed save redirect to index path and not render `new` template.
Change `destory` to `withdraw`, cause `destroy` makes DELETE request when
we are updating the event record.
Check for success for save in withdraw (save can fail for reasons other than validation).
2016-03-24 11:37:40 +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
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
Henne Vogelsang
80a06b99b4
Merge pull request #894 from differentreality/comments
...
rewrite comments form, use strong parameters with comments
2016-03-22 18:26:38 +01:00
Stella Rouzi
3f882957cf
rewrite comments form, use strong parameters with comments
2016-03-20 19:06:12 +02:00
Rishabh Saxena
99afc456cd
correcting ticket's details view and its related models.
2016-03-19 01:52:38 +05:30
Aditya Prakash
3e32c58460
Allow submission of proposal only if program has cfp
2016-03-18 09:18:05 +05:30
Nishanth Vijayan
fd64db575b
Remove datatable functionality from Roles index table.
...
The table in roles#index view has no need of datatable features as the number of roles is just 4.
2016-03-16 12:09:58 +05:30
Aditya Prakash
dd159c5555
Fix edit and schedule buttons on proposal show page
2016-03-13 18:51:08 +05:30
Christian Bruckmayer
b18e302224
Merge pull request #852 from differentreality/programs_typo
...
Fix variable @program typo in programs#show
2016-03-10 15:51:29 +01:00
Aditya Prakash
afc58d3d85
Fix overflow of proposal edit in admin area
2016-03-10 17:42:09 +05:30
Stella Rouzi
fb4e8958e0
Fix variable @program typo in programs#show
2016-03-09 20:11:59 +02:00
