Commit graph

77 commits

Author SHA1 Message Date
Ana
028d430885 Schedule height fits a 600px screen and the schedule is hiden if there is only one room 2016-06-27 18:24:47 +02:00
Ana
1846eebea3 Changing the text color of tracks 2016-06-20 17:09:39 +02:00
Stella Rouzi
2efd1bc92d fixes 2016-06-15 18:12:46 +03:00
Nishanth Vijayan
6eda97e10c Remove unused helper methods 2016-05-21 01:00:46 +05:30
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
f1f5fc1cd4 Use PictureUploader on Sponsor 2016-04-27 17:40:23 +02:00
Stella Rouzi
01ec43e53a Registration for Events 2016-04-26 16:11:40 +03: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
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
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
Nishanth Vijayan
ab339fadb0 Fix typos: volunteer_coordinator to volunteers_coordinator 2016-04-09 03:50:27 +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
Nishanth Vijayan
19c54bd935 Change all redirect_to(path) to redirect path for uniformity 2016-03-16 09:17:41 +05:30
Stella
ccd7ecbb90 Roles into their own controller. Rework interface. Add flash messages to ajax calls. Add description to roles. Possible to edit roles in use. 2016-03-01 17:10:45 +02:00
Stella Rouzi
444356fbc7 Introduce Program to include cfp/rooms/tracks/events/event_types/difficulty_levels 2016-02-06 17:42:51 +01:00
raluka
f7c70ba55c updated comment layout from upstream; added grouped_by_event behaviour to comments_dropdown and helper 2015-09-21 15:56:57 +02:00
raluka
21c10166ec added test file for comments_controller WIP 2015-09-17 12:13:22 +02:00
raluka
945bac1fe8 WIP modified CommentsController#index 2015-09-17 12:13:22 +02:00
raluka
cd2a52023b changed comments helper to proper return unread comments available for current_user 2015-09-17 12:13:22 +02:00
raluka
52a503afd2 changed #signed_in_with_roles(user) in ability.rb model 2015-09-17 12:13:21 +02:00
raluka
74dcd75a8c created can_manage_comments helper for rendering button 2015-09-17 12:13:21 +02:00
raluka
6985493e5c unread_notifications has no longer assigned instance variable 2015-09-17 12:13:21 +02:00
raluka
35714f350e Issue#15: Added Comment Notifications: notification_emails and comments view 2015-09-17 12:13:21 +02:00
Stella Rouzi
30831ce718 Add styling to passwords and confirmations 2015-06-11 15:20:48 +03:00
Stella Rouzi
969c24c091 Move common views to partial 2015-06-11 15:20:48 +03:00
Björn Geuken
1862534b2c Avoid float conversion when calculating progress 2015-05-16 15:27:34 +02:00
Stella Rouzi
e6bb168c5e Refactoring of proposal workflow. Fixes #215 2015-04-16 18:37:31 +03:00
Henne Vogelsang
e8ab94e1c7 Implements sign up during registration. Solves most of #215 2015-03-12 23:53:57 +01:00
Shayon Mukherjee
54bcc89204 Refactored nested comments. Now using partial to load them 2015-02-27 12:29:18 -06:00
Sameer Deshmukh
ee3def430e replace if-else with case-when
replaced if-else with case-when

slight update
2015-02-27 11:28:20 +05:30
Henne Vogelsang
d13efa5f52 Various small fixes for the participant UI 2014-12-05 16:04:34 +01:00
Henne Vogelsang
cb227a0afc Another round of splash design
* Add map to splash
* Reverse venue<->conference relation
* Split venue address into fields
* Don't go through venue for lodgings anymore
2014-11-20 15:39:26 +01:00
Henne Vogelsang
a9581445f3 Provide a helper to point to sign up/in for different configs 2014-11-12 10:20:53 +01:00
Chrisbr
c995f57877 Fixes the proposal abstract word count javascript functions
fix #510
2014-10-05 18:58:47 +02:00
Stella Rouzi
2d2b605063 deletions 2014-09-02 22:23:49 +03:00
Stella Rouzi
b7c45718d8 apply StringLiterals cop (remove double quotes, unless there is string interpolation) 2014-09-02 21:45:07 +03:00
Chrisbr
5f8a8ac6d9 Refactoring Tickets
- Tickets now independent from registration
- Implemented money gem
#419
2014-08-28 15:21:05 +02:00
James Mason
9415128fcb Switch todo glyphs to FontAwesome 2014-08-18 08:49:44 -07:00
Stella Rouzi
beb88b848d changes from comments, fix commercials failing test 2014-08-13 22:53:15 +03:00
Stella Rouzi
aeb28833f1 fixes 2014-08-13 22:53:14 +03:00
Stella Rouzi
e2fb434dc7 Implement role authorization 2014-08-13 22:53:13 +03:00
Gopesh Tulsyan
4809edffe4 Removed brand helper for consistency, replaced glyphicons with fontawesome icons 2014-08-12 17:04:16 +05:30
Henne Vogelsang
5f96c276e9 Rework the Sign Up/Sign In views
Use Capybaras save_page when feature tests go wrong
2014-08-01 13:35:06 +02:00
Gopesh Tulsyan
993f818073 Merge pull request #340 from gopesht/fix#232
Navigation fixed, able to navigate to root_path from any page.
2014-07-28 21:31:46 +05:30
Artem Chernikov
5289f41eb5 Use only new hash syntax 2014-07-21 15:05:58 +02:00
Artem Chernikov
056fe5ec3f Fix others additional lints 2014-07-21 15:05:58 +02:00
Gopesh Tulsyan
8bffa7e8c2 Navigation fixed 2014-07-19 20:36:51 +05:30
Gopesh Tulsyan
c68c6394bc Removed conference_date_string_helper, moved date_string to application_controller
Deleted home_helper.rb
2014-07-10 22:12:11 +05:30
Gopesh Tulsyan
fbf52b1d69 Merge pull request #273 from gopesht/implements_markdown
Implements markdown
2014-07-03 21:01:46 +05:30