Commit graph

153 commits

Author SHA1 Message Date
James Mason
fba12aef24
Only include transifex JS if the ENV var is set
... otherwise, don't bother loading this blocking external resource.
2017-11-12 20:43:02 -08:00
James Mason
1b8f864feb
Use organization name for title link if available, but link to / 2017-11-07 13:51:10 -08:00
Nishanth Vijayan
68788ce9fc Show conference changelog
Use load_and_authorize_resource in versions controlller
Add conference specifc route to revision history page
Users with role can view revision_history only for the versions they have access to
Handle versions where conference_id is not set (records before papertrail was introduced)
2017-08-24 10:24:13 +00:00
nasia
bc45531efd Add My Booth Requests to user menu 2017-08-23 14:09:34 +03:00
nasia
834e9d96e4 Add booths to admin sidebar 2017-08-23 14:09:34 +03:00
nikhilgupta1211
d0a9610992 Made Sidebar collapsible for small screens
Added a hamburger button in _admin_html.haml for navbar collapse

Fixes #853
2017-08-21 12:52:33 +03:00
AEtherC0r3
3d250ecf75 UI/UX changes related to tracks
Add confirmed and cfp_active scopes to Track
Render markdown in track's description
Make the views more similar to the proposal/events views
Change the sequence of columns in admin/Tracks#index
Remove the short_name column from the index views
Add button "My Tracks" in the user menu
Fix track count in proposals
Add details of track in admin/Tracks#show
Use tabs to show track details and events
2017-08-11 16:25:21 +03:00
shlok007
83abc9f71f remove Organization suffix from navbar-brand in navigation 2017-08-10 11:17:36 +05:30
shlok007
28b55a9d72 remove OSEM_NAME from navigation 2017-08-10 11:17:36 +05:30
shlok007
17eacaec0d add tests for organization name in conference views
remove tests for organization name in conference#edit
2017-08-10 11:17:36 +05:30
shlok007
cdc08052b1 display organization name in menu bar 2017-08-10 11:17:36 +05:30
Svante
f9d8c9715c Add bootstrap styling to sign in form
Add class `.form-control` to inputs and remove additional width styling
2017-07-15 16:15:01 +03:00
shlok007
ddf6f4b4c9 fix new conference links 2017-07-12 19:24:22 +05:30
AEtherC0r3
2bff918556 Add index view for the cfp and modify existing ones
Add cfp_type to the form partial
Refactor Cfps#show to use partials for the different cfp types
Modify the rest of the view, where the cfp was used
2017-06-27 21:16:46 +03:00
shlok007
e0d8e85808 suggested changes 2017-06-12 19:43:44 +05:30
shlok007
8edf896d86 introduce organizations 2017-06-12 19:43:44 +05:30
Siddhant Bajaj
53a2246ff2 Fixed issue in notification drop down menu
Fixed an indentation issue in notification drop down layout.
2017-05-13 17:48:05 +03:00
Stella Rouzi
5e9bc683ae Move reports to separate controller 2017-03-20 17:51:37 +02:00
divyanshumehta
1ca448df6f Changed Ruby syntax in views. Fixed #1326 2017-03-20 18:27:39 +05:30
gotens1211
db2d776c3b Sign in Ui improved in mobile
hover fix for sign_in btn

improved osem-navbar.css.scss

removed class black
2017-03-08 21:20:11 +05:30
Ana María Martínez Gómez
f42e4adc45 Merge pull request #1261 from shlok007/resources
Ability to track resources
2017-02-09 10:45:51 +01:00
Shea Munion
96cfc036bc Remove superfluous 'sign in' link. 2017-02-07 19:26:51 -06:00
JewelSam
0e55a7a3ac #1271 - made 'Remember me' label clickable 2017-02-07 19:36:13 +03:00
shlok007
3065766da9 ability to track resources used in conference 2017-02-07 14:58:45 +05:30
Stella Rouzi
46101228e7 Merge pull request #1169 from nishanthvijayan/reports
Add new page with organizer reports
2017-01-15 12:28:38 +02:00
richiethomas
daf1f805bd Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController' 2016-09-30 18:49:44 -04:00
Nishanth Vijayan
fabe29d2ed Add new page with organizer reports 2016-09-27 21:24:49 +05:30
Nishanth Vijayan
a45e537bac Setup basic Revision History page
Sets up paper_trail tracking in important models

and add conference_id to versions for storing conference_id
of conference related objects  as metadata.This will help in querying
for versions related to conferences.

Fix issues with factories & event types initialization.Import paper_trail testing helpers
Fix bug: Creating an event creates a useless version with event update

Add revert and view changes features to revision history
2016-08-12 13:35:56 +05:30
Ana
0e9b8b598f Use jquery-ui-rails gem 2016-08-11 15:11:27 +02:00
Ana
29b920d746 Corrections in SchedulesController
- Controler file name pluralized
- Load and authorization fixed and improved
- Consider that save can fail in create action
- Eliminate unnecessary if in update action
- Ability and tests related to the schedules link in the admin sidebar fixed
2016-08-11 15:11:27 +02:00
Ana
42848f929b Several schedules in the backend && routes changed
- Introduce plural resources for Schedule in routes.rb
- Introduce #index and #create actions for ScheduleController
- Make it possible to set a schedule as selected_schedule
2016-08-11 15:11:27 +02:00
Ana
dfd64a4510 Integrate the schedule in the admin interface
Integrate the schedule in the admin interface while adapting it to the new associations and models.
2016-08-11 15:06:52 +02:00
Nishanth Vijayan
e83b2c3a90 Display sponsor pages only if sponsorship levels are defined 2016-05-19 19:11:38 +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
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
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
David Sedeño
f3f40822b0 Put the config name as title in layouts. fix #773 2016-02-11 21:56:15 +01:00
Stella Rouzi
f840f2b3f0 Rooms belong to venue 2016-02-06 17:43:51 +01:00
Stella Rouzi
444356fbc7 Introduce Program to include cfp/rooms/tracks/events/event_types/difficulty_levels 2016-02-06 17:42:51 +01:00
Stella Rouzi
8ffa8b1e86 Venue has show action, not index. Make the ability to schedule an Event more clear. 2016-01-13 13:16:15 +02:00
Stella Rouzi
759aa54689 Syntax style + code groomming 2015-10-06 14:15:38 +03: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
f3996a9bff added extra condition for view Create Conference link 2015-09-17 12:13:22 +02:00
raluka
37339dccc1 refactored comments_controller tests; fixed access to Administration link into user_menu view 2015-09-17 12:13:22 +02:00
raluka
7ba3cfd473 event title and conference title in 2 different lines now in view 2015-09-17 12:13:22 +02:00
raluka
0c39590f2e fixed Administration link in user_menu dropdown 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
e10a2491d3 created tests for user ability 2015-09-17 12:13:21 +02:00
raluka
b780996128 created comments with FactoryGirl 2015-09-17 12:13:21 +02:00