Commit graph

31 commits

Author SHA1 Message Date
Stella Rouzi
01ec43e53a Registration for Events 2016-04-26 16:11:40 +03: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
CamilleM
c5da563a48 Merge branch 'master' of https://github.com/camillem/osem 2016-03-26 23:37:35 +01: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
Aditya Prakash
dcb98c49f9 Improvements in proposal controller
`if..else` is better than unless with return.
On failed update render `edit` template and not render `new` template.
On failed save redirect to index path and not render `new` template.
Change `destory` to `withdraw`, cause `destroy` makes DELETE request when
we are updating the event record.
Check for success for save in withdraw (save can fail for reasons other than validation).
2016-03-24 11:37:40 +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
Aditya Prakash
3e32c58460 Allow submission of proposal only if program has cfp 2016-03-18 09:18:05 +05:30
Henne Vogelsang
feaf9d8078 Feature: Add/change Track for Event 2016-03-05 02:54:09 +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
e6bb168c5e Refactoring of proposal workflow. Fixes #215 2015-04-16 18:37:31 +03:00
Henne Vogelsang
f2cdea4f1a Integrate the splash page into the general layout
* Cleanup the CSS
* Fix more views then you have fingers and toes
* Introduce position(weight) for sponsor levels
* Fix bootstrap/datatable integration
2014-11-17 13:58:27 +01:00
Chrisbr
d21e19b977 Big refactoring of registration
- Added datatable gem
- Addaed datatable to events, users (#422), registrations
2014-08-22 15:08:54 +02:00
Stella Rouzi
e2fb434dc7 Implement role authorization 2014-08-13 22:53:13 +03:00
Henne Vogelsang
c982cbb88a Refactored proposal. Enabled cancancan 2014-07-23 16:24:05 +02:00
Stella Rouzi
23bf55b66c User/Person models merge 2014-06-30 15:46:06 +03:00
Chrisbr
e5b588df81 Refactoring event states 2014-06-06 10:23:01 +02:00
Chrisbr
12fd3b7d5a Fix id in forloop 2014-05-13 16:45:43 +02:00
Chrisbr
656ded9d96 Implements feature test for proposal workflog
- submitt proposal
- accept proposal
- confirm proposal
2014-05-13 15:45:39 +02:00
Chrisbr
2ca99e7ab9 Fix accept event workflow 2014-05-12 18:35:28 +02:00
Henne Vogelsang
587126218d Update gems, use d3 gem, initial bootstrap v3 port 2014-03-17 16:42:19 +01:00
Henne Vogelsang
9d09d6d038 Merge pull request #28 from differentreality/event_registration
Show No of registrations for proposal, in proposal index page
2014-01-23 03:25:04 -08:00
differentreality
0590da056e Do not show New submission button if cfp is closed, unless organizer or admin 2013-07-28 13:11:34 +03:00
differentreality
3192ad9d4c show no of pre-registered people in proposal list 2013-07-11 08:27:54 +03:00
Henne Vogelsang
9d668ad1b1 Add flexvideo class, enable proposal editing, 2013-06-20 00:26:34 +02:00
Henne Vogelsang
178e584730 Fix confirming of proposals 2013-05-07 17:00:26 +02:00
Henne Vogelsang
3022e8b8e6 Minor features/fixes
* Fix admin sub menus
* Show email address in people#index
* Add User Area link in navbar
* Smaller textareas on proposal#new so you don't have to scroll
* Counting of registrations, users and people
* Use datatables for users and people
* Show event type on admin/events#show
2013-05-07 14:46:33 +02:00
Matt Barringer
a9207671b8 Allow users to confirm their proposal 2013-01-08 08:51:34 +01:00
Matt Barringer
3181c1c0d8 Making the user workflow easier 2013-01-08 08:36:21 +01:00
Matt Barringer
f86232bedf Added paper_trail, also starting work on the scheduler 2013-01-07 16:45:48 +01:00
Matt Barringer
90b30db9e8 First checkin 2013-01-07 09:04:09 +01:00