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
shlok007
835859e350
refactored DomainConstraint and conference_controller_spec
...
use params id instead of OSEM_HOSTNAME to load conference
2017-08-22 21:18:58 +00:00
shlok007
66b48be968
controller tests for custom domain
2017-08-22 21:18:58 +00:00
shlok007
f4775f8e6a
fix access denied error for program in custom domains
2017-08-22 21:18:58 +00:00
shlok007
0ac5d18ef2
route to conference#show for custom domain
2017-08-22 21:18:58 +00:00
shlok007
1a5aa14e2c
Mention organization name while creating a conference
2017-08-22 18:33:05 +00:00
shlok007
c596a9fda7
add tests to assign and unassign organization admin role
2017-08-22 12:52:47 +00:00
shlok007
a91c67be0a
add views for organization admin role
2017-08-22 12:52:47 +00:00
shlok007
db8fdb3d38
add permissions and actions to assign and unassign organization admin role
2017-08-22 12:52:47 +00:00
Ana María Martínez Gómez
4c1b56b54f
Merge pull request #1634 from siddhantbajaj/admin-registration
...
Registration tickets to be set before registration period
2017-08-22 14:12:48 +02:00
Ana María Martínez Gómez
84522a999a
Merge pull request #1606 from siddhantbajaj/ticket-purchase
...
Refactor ticket purchase
2017-08-22 14:07:57 +02:00
siddhantbajaj
157c270497
Registration tickets to be set for registration period
...
Admin must create at least one registration ticket before creating registration period.
2017-08-22 15:20:37 +05:30
Ana María Martínez Gómez
22fc20468f
Merge pull request #1638 from siddhantbajaj/add-qr
...
Added QR code
2017-08-22 10:44:45 +02:00
siddhantbajaj
4b735cff69
Added qr code
...
Added qr code on ticket pdf and ticket show page.
2017-08-21 16:49:50 +05:30
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
nasia
52cde784fa
Add :accept booth to ability
2017-08-18 23:41:38 +03:00
nasia
e73218b5ca
Add booth limit
2017-08-18 23:41:38 +03:00
nasia
703813248d
Request a booth only when cfp is open
2017-08-16 16:51:52 +03:00
nasia
8b5ebb3dd7
Add confirmed booths to splashpage
2017-08-16 16:51:52 +03:00
Ana María Martínez Gómez
3f324d4e6f
Merge pull request #1613 from siddhantbajaj/read-qr
...
Scan QR code.
2017-08-16 10:05:06 +02:00
siddhantbajaj
1391668c0f
Add routes and controller to scan Qr code
...
Added TicketScanning controller and routes to scan qr code on PhysicalTickets. Added test for the same
2017-08-15 13:16:46 +05:30
nasia
7107f9a35f
Add emails for booth's acceptance and rejection
2017-08-14 22:34:17 +03:00
damien clochard
5f9c0065c6
FIX : links
2017-08-12 17:48:55 +03:00
divyanshumehta
b4be83e3a6
Removed delete action from abiltiy.rb and other places
...
There was no delete action defined for proposals, but it was there in ability.rb So the ability was deleted. Fixes #1608
2017-08-11 18:10:25 +03:00
AEtherC0r3
b717018b31
Track related fixes
...
Make the message in admin/Tracks form more visible by making it bold and
adding links to venue and rooms
Make papertrail track changes for all the track's attributes
Add validation to require presence of description for self-organized
tracks
Add ID column to admin/Tracks#index
Make the cfp inclusion column sortable
Show success/error flash messages after toggling cfp inclusion
2017-08-11 16:25:21 +03:00
AEtherC0r3
5f1ed7ce85
Handle Tracks as resource_type in User#get_roles
2017-08-11 16:25:21 +03:00
AEtherC0r3
2ff4c6d6b2
Add relevance field for track requests
...
The requester can now provide more info about the track and himself
2017-08-11 16:25:21 +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
AEtherC0r3
f9903eba16
Change Cfp scopes to class methods
...
When no record matches the requested criteria a scope will return all
the records
In this case, if no record can be found we want the result to be nil
Also, make some readability fixes in specs
2017-08-11 16:25:21 +03:00
AEtherC0r3
d9faffc96a
Implement track request acceptance
...
Allow track submitter to request specific dates
Redirect to Tracks#edit if a track doesn't have a room or start/end date
before accepting it
Don't allow the submitter or the track organizers to edit the request
after it has been accepted or confirmed
Restrict track selection in proposals and move track selection from
Proposals form to events helper
Mark cfp_active of the tracks table as not null and fill in true if nil
2017-08-11 16:25:21 +03:00
AEtherC0r3
2f9eb04219
Enable track requests
2017-08-11 16:25:21 +03:00
AEtherC0r3
0f154d07c9
Mark track state as not null and add default value
...
The regular tracks are marked as 'confirmed'
2017-08-11 16:25:21 +03:00
AEtherC0r3
fd93b04f16
Add room and dates to tracks
...
They are required only for accepted and confirmed self-organized tracks
2017-08-11 16:25:21 +03:00
AEtherC0r3
d616c66745
Define the track's finite state machine
2017-08-11 16:25:21 +03:00
Wexpo Lyu
33aee342b4
Add new envs to dotenv.example.
2017-08-11 12:03:02 +03:00
Wexpo Lyu
88e31ad902
Expose enable_starttls_auto & openssl_verify_mode.
...
And align `ENV` calls to keep up with codes above.
My fault for using tabs.
which caused a real misalignment.
2017-08-11 12:03:02 +03:00
Ana María Martínez Gómez
bd62df14c3
Fix vagrant broken after updating to Ruby 2.4
...
Ruby got updated in https://github.com/openSUSE/osem/pull/1588 ,
But there was a repo missed, so Ruby 2.4 can be installed in our Vagrant
machine.
Closes https://github.com/openSUSE/osem/issues/1601
Mob-programmed by @mdeniz, @DavidKang and @Ana06.
2017-08-11 11:57:01 +03:00
Ana María Martínez Gómez
6efcd04de1
Merge pull request #1627 from siddhantbajaj/registration-ticket
...
Added registration-ticket
2017-08-11 10:02:28 +02:00
siddhantbajaj
f31651ad9c
Added registration-ticket
...
Added registration type tickets that will used in the check-in process
2017-08-10 21:15:54 +05:30
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
shlok007
540c982771
mention organization in dashboard, splashpage and admin/conference#edit
2017-08-10 11:17:36 +05:30
nasia
32c5af2a17
Add booths to non admin
2017-08-08 16:18:07 +03:00
Wexpo Lyu
033dbe4c40
Fix the dropdown to get enough bottom padding.
2017-08-07 13:41:10 +03:00
AEtherC0r3
9b7562fe2e
Update autoprefixer-rails to 7.1.1
2017-08-07 12:23:01 +03:00
AEtherC0r3
cb8010bafe
Update omniauth-oauth2 to 1.4.0
2017-08-07 12:23:01 +03:00
AEtherC0r3
2824336ead
Update sprockets to 3.7.1
2017-08-07 12:23:01 +03:00
