gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-14 20:24:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1823 commits 15 branches 2 tags 50 MiB
Commit graph

665 commits

Author SHA1 Message Date
Nishanth Vijayan
e83b2c3a90 Display sponsor pages only if sponsorship levels are defined 2016-05-19 19:11:38 +05:30
Henne Vogelsang
02487be6fb Merge pull request #1002 from nishanthvijayan/fix-deprecation-warnings 
Fix deprecation warnings
 2016-05-19 14:37:39 +02:00
Henne Vogelsang
81ddb76c24 Merge pull request #994 from differentreality/allow_nil_max_attendees 
allow max_attendees to be nil
 2016-05-19 12:03:43 +02:00
Henne Vogelsang
afbffbf2b1 Merge pull request #1004 from ChrisBr/proposal_show 
Make proposal show view more robust
 2016-05-19 12:00:23 +02:00
Henne Vogelsang
20be0f58ba Merge pull request #1005 from ChrisBr/ichain 
Hide Submit proposal if iChain is enabled and user is not logged in
 2016-05-19 12:00:10 +02:00
Christian Bruckmayer
aa925f9f75 Hide Submit proposal if iChain is enabled and user is not logged in 
because it's not possible to create a user while submitting a proposal when iChain is enabled. User would get
not authorized error message.
 2016-05-19 11:49:20 +02:00
Christian Bruckmayer
acf5b6e8f2 Make proposal show view more robust 
Partially fixes #718. Some objects have an foreign_key set on track, difficulty level or room but the
referenced object does not exists. This is caused by introducing dependent: nullify after deleting
some of the objects. This commit will make the show page more robust, however, we need to
fix the corrupt objects in an additional commit.
 2016-05-19 10:40:27 +02:00
Nishanth Vijayan
13f0f9703d Replace usage of deprecated member_label option in forms with Array of label/value pairs 2016-05-18 23:26:47 +05:30
Stella Rouzi
528243c8b9 Allow max_attendees to be nil 2016-05-15 14:01:36 +03:00
Stella Rouzi
50ab392c0f Fix bio length when nil in user#edit 2016-05-15 13:17:53 +03:00
Christian Bruckmayer
65ee166570 Merge pull request #977 from differentreality/fix_admin_registrations 
fix admin/registrations#update
 2016-05-12 15:57:10 +02:00
Ana
590790732d travel schedule problem fixed 2016-05-11 16:40:04 +02:00
Henne Vogelsang
5149379424 Fix ichain sign in form 2016-05-09 15:24:57 +02:00
Stella Rouzi
9fe7d0ca7c Use strong parameters for user in admin/registrations#update 2016-05-02 18:02:57 +03:00
Stella Rouzi
6bcecbd219 fix admin/registrations#update 2016-05-02 17:38:55 +03:00
Henne Vogelsang
12c5e3d512 Merge pull request #982 from hennevogel/feature_demo_data 
Demo Data
 2016-05-02 16:19:16 +02:00
Henne Vogelsang
1c7becb69a use :full_conference factory in the conference view specs 2016-05-02 16:06:32 +02:00
Stella Rouzi
2b1aeafcd8 javascript load for user_biography 2016-05-01 19:16:19 +03:00
Henne Vogelsang
ebcb2780cd Configure OSEM via environment variables 
Instead of reading a yaml file we get configuration from the
environment.
 2016-04-29 16:36:47 +02:00
Henne Vogelsang
2a4de3e869 Use PictureUploader on Venue 2016-04-27 17:55:17 +02:00
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