Commit graph

2520 commits

Author SHA1 Message Date
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
Hernan Schmidt
d9a3b0de72 Fix Style/ConditionalAssignment errors
They did not get excluded by `--auto-gen-config`
2017-07-14 15:16:43 +02:00
Hernan Schmidt
523203ac74 Update rubocop_todo.yml
Generated automatically by `rubocop --auto-gen-config`
2017-07-14 15:16:43 +02:00
Hernan Schmidt
b2bd6080c2 Update Rubocop to 0.49.1 2017-07-14 15:16:43 +02:00
nasia
b86472ac3c Add Call for Booths 2017-07-14 15:14:25 +03:00
Hernán Schmidt
4615505fcd Merge pull request #1584 from openSUSE/update-byebug
Update Byebug to latest version
2017-07-14 12:51:43 +02:00
AEtherC0r3
9c58397cd2 Enable Style/IndentationWidth cop
The offenses were fixed manually
2017-07-14 12:47:20 +03:00
AEtherC0r3
e3b51dfc2b Add TrackControllers specs 2017-07-14 12:38:53 +03:00
AEtherC0r3
9671696adf Add to_param to the Track model
And update the urls
2017-07-14 12:38:53 +03:00
AEtherC0r3
68fc750e9f Implement track requests and add the track organizer role
About track requests:
Create migration that adds the fields submitter_id, state, and
cfp_active to Tracks
Add validations and the self_organized? method to the Track model
Create a new TracksController outide of the admin namespace
Create the relevant views for index, show, new and edit
Modify the admin views for tracks to include extra info for
self-organized tracks

About track organizers:
Create the role when a self-organized track is created
Define track organizer abilities
Modify the roles views and controller to handle the new role

The route for Roles#edit needs to have higher priority than the nested
routes for track roles, otherwise, the word edit in the url is matched
as a track with short_name edit
2017-07-14 12:38:53 +03:00
shlok007
98fc1137e1 suggested changes 2017-07-13 23:45:13 +05:30
shlok007
05fdd443a4 fix failing tests for volunteers_coordinator 2017-07-13 23:45:13 +05:30
shlok007
d26a5dcf9b fix failing tests about accessing admin area 2017-07-13 23:45:13 +05:30
shlok007
366fced200 Move abilities for admin views in separate model 2017-07-13 23:45:13 +05:30
Hernan Schmidt
8652a5cb78 Update Byebug to latest version 2017-07-12 16:40:13 +02:00
shlok007
ea43b19ef4 add tests for new conference links 2017-07-12 19:24:22 +05:30
shlok007
ddf6f4b4c9 fix new conference links 2017-07-12 19:24:22 +05:30
shlok007
eb23d838b5 correct past and upcoming conferences in admin/organizations#index 2017-07-12 17:42:19 +05:30
Moisés Déniz Alemán
036b590823 Merge pull request #1579 from siddhantbajaj/ticket-scanning
Added TicketScanning Model
2017-07-12 11:07:22 +02:00
Ana María Martínez Gómez
da3846a727 Merge pull request #1581 from openSUSE/revert-1575-show-page
Revert "Ticket show page"
2017-07-12 10:33:44 +02:00
Moisés Déniz Alemán
43b4204e30 Revert "Ticket show page" 2017-07-12 10:33:16 +02:00
Ana María Martínez Gómez
17b72da38f Merge pull request #1575 from siddhantbajaj/show-page
Ticket show page
2017-07-12 10:11:55 +02:00
siddhantbajaj
c066aadae2 Added TicketScanning Model 2017-07-11 17:05:07 +05:30
siddhantbajaj
fbd4be3503 Ticket show page 2017-07-10 17:45:05 +05:30
TheAssassin
93d5e360ca Merge dockerize commands 2017-07-09 21:38:43 +02:00
TheAssassin
6dea37ec41 Add missing environment variable 2017-07-09 21:38:43 +02:00
TheAssassin
13d6bf471d Wait for database to be started before running MySQL client command 2017-07-09 21:38:43 +02:00
TheAssassin
ad9ef4aba3 Fix secret key generation 2017-07-09 21:38:43 +02:00
TheAssassin
b5ca626873 Fix Git ignores 2017-07-09 21:38:43 +02:00
TheAssassin
dd993b7448 Fix issue mentioned in osem/pull/1407
After the rebase (to update the PR with the latest changes), I had the
same issue @lguerard has had. I noticed that the rails server didn't
lisen on all interfaces any more, but bound the port to the loopback
device only. By adding the parameter `-b 0.0.0.0`, I restored the
previous behavior, and OSEM could be reached with the browser after it
started up (takes a few seconds).
2017-07-09 21:38:43 +02:00
TheAssassin
c592a19f2d Use rails secret to generate the secret key 2017-07-09 21:38:43 +02:00
TheAssassin
d7765bf4fd Update ignores 2017-07-09 21:38:43 +02:00
TheAssassin
769643a642 Remove MySQL config file again as soon as possible 2017-07-09 21:38:43 +02:00
TheAssassin
28d9ac9b1f Switch to built in rails server 2017-07-09 21:38:43 +02:00
TheAssassin
2c3c070f7e Update Docker docs 2017-07-09 21:38:43 +02:00
TheAssassin
9402eb36d8 Add beginner guide for deploying OSEM with Docker 2017-07-09 21:38:43 +02:00
TheAssassin
8229cca1e8 Add missing dependency to Dockerfile 2017-07-09 21:38:43 +02:00
TheAssassin
f15fe9ddb0 Docker support for production use
This commit adds a Docker infrastructure that is ready for production
use. It is meant to simplify the deployment of OSEM for everyone who
wants to host their own instances.

It includes many features like data persistence, automatic secret key
generation and persistence and automatic database initialization and
upgrading. This should make updating the Docker container as easy as
possible.
2017-07-09 21:38:43 +02:00
shlok007
b33e9ed28e fix revision count and drop observers 2017-07-09 03:36:57 +05:30
shlok007
518ecc3d4e rebuild schema.rb for sqlite3 2017-07-09 01:57:44 +05:30
shlok007
9c6286182e caching comment counts 2017-07-09 01:57:44 +05:30
Hernán Schmidt
89840d0bab Merge pull request #1573 from openSUSE/fix-schema
Fix schema.rb
2017-07-08 19:28:50 +02:00
Hernán Schmidt
1ba797bead Fix schema.rb
In #1570, db/schema.rb got broken, as the version was not updated.
2017-07-08 18:45:38 +02:00
Ana María Martínez Gómez
815b9e6e14 Merge pull request #1570 from siddhantbajaj/ticket-layout
[WIP] Make ticket layout configurable
2017-07-07 15:23:47 +02:00
siddhantbajaj
4c957a8b17 Updated Paper Trail 2017-07-07 14:22:02 +05:30
siddhantbajaj
dd52a9b2ab Make ticket layout configurable
Added option for conference organizer to switch between ticket layouts (horizontal or vertical). Added test for the same.
2017-07-07 14:19:51 +05:30
Ana María Martínez Gómez
e25de318bd Merge pull request #1559 from siddhantbajaj/purchase-index
[WIP] Ticket Purchase Index Page
2017-07-06 09:28:32 +02:00
Ana María Martínez Gómez
570fec5a9f Merge pull request #1539 from siddhantbajaj/PdfTicket
Sample prototype for ticket pdf
2017-07-06 09:06:33 +02:00
siddhantbajaj
a327d2cbd2 Ticket Purchase Index Page
List all the unpaid ticket purchases of the user for that conference and allow user to pay for them.
2017-07-06 02:46:53 +05:30
L11
2cc97a92f5 Remove duplicated label - target/form 2017-07-05 18:39:29 +03:00