shlok007
b29856a122
suggested changes
2017-06-12 19:43:44 +05:30
shlok007
cce3ff7aea
creating default organization while creating a conference
2017-06-12 19:43:44 +05:30
shlok007
3fb316482c
suggested changes
2017-06-12 19:43:44 +05:30
shlok007
e0d8e85808
suggested changes
2017-06-12 19:43:44 +05:30
shlok007
8edf896d86
introduce organizations
2017-06-12 19:43:44 +05:30
shlok007
ce9d2b3c5b
fixes failing haml-lint in admin/conference/show
2017-06-12 18:37:50 +05:30
nasia
8cd3326520
Add charts about sold tickets
2017-06-12 15:24:27 +03:00
selini
071ed50acb
Hide recent Registrations/Submissions when conference is over
2017-06-12 12:31:31 +03:00
AEtherC0r3
02d75ec729
Fix registration sorting
...
Sort the 'Actions' column by registration.attended
2017-06-03 12:37:56 +03:00
AEtherC0r3
fa56ff7f6d
Add helper function for speaker selection
...
The line '@users = User.all.order(:name)' is replicated a lot of times
in EventsController and ProposalsController.
So, this commit removes it and adds a helper function
'speaker_selector_input' that generates the field where the @users
variable was used.
Also, it makes the query more specific.
Fix #1455
Other changes:
* Include the username in the drop down menu
* Add .active scope to User and corresponding tests
* Add :disabled trait to User factory
2017-05-20 18:27:07 +03:00
AEtherC0r3
36b8088726
Replace submitter with speakers in reports#index
...
Also, in events#show and proposals#index
It is more relevant to check if the speakers have registered to the
conference and filled their biographies than the submitter, because,
there can be multiple speakers and the submitter isn't necessarily one
of them
And, remove admin/events/reports.html.haml, since, it isn't used anymore
Fix #1477 , fix #1479
2017-05-20 18:26:45 +03:00
Chaitanya
008ccf8b6d
Add user path to Attendee and Speaker avatar in registration show page
...
Avatars of attendee and speaker are not linked to respective attendee and speaker. Add user path to each avatar to give more information of attendee and speaker
2017-05-13 22:14:57 +03:00
hitman
e73baa2754
add validation for name, used and quantity
2017-05-13 18:30:30 +03:00
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
AEtherC0r3
fdff485b3e
Allow confirmed speakers to register anytime
...
If the registration period is over then speakers of confirmed events
can't register anymore. They should be able to, since they are gonna be
there anyway.
* Allow the speakers of confirmed events to register regardless of the
registration period
* Provision for registrations of confirmed speakers, so as not to
exceed the registration limit
* Add scope for registered speakers
Fix #829 and fix #802
2017-05-13 17:47:22 +03:00
Ana María Martínez Gómez
0aff947f05
Fix haml-lint error
...
The error was introduced when merging
https://github.com/openSUSE/osem/pull/1469
as a offense was introduced since the tests there were run
and the PR got merged.
2017-05-11 11:59:33 +02:00
selini
8a0f3c99b0
Create links for speakers in admin/reports#index
2017-05-10 10:34:45 +03:00
Eugene Dubinin
93404d543f
implement user creation by admin
2017-05-08 22:54:02 +03:00
divyanshumehta
f057900fb1
Added link to lodging section in splashpage's navbar
2017-05-08 15:28:28 +03:00
David Sedeño
ec71b111fe
Add description to xml. fixes #1435
2017-04-25 13:35:09 +03:00
gotens1211
3ead7ef586
Removed the extra condition for displaying the first speaker image
...
Removed the if statement in schedule_item.html.haml file which was generating an extra img_tag for the first speaker
Fixes #1454
2017-04-17 17:40:23 +05:30
Eugene Dubinin
790e2fd3a2
implement manual event management and support for multiple speakers per event
2017-04-13 17:15:21 +03:00
nasia
7497d0394e
Fix Splashpages#show so it matches splashpages#edit
2017-04-05 19:18:17 +03:00
gotens1211
eb1e8ed238
Changed the default state of components in splashpage to selected
...
Mark the splashpage components to checked for the new action, also modified the display changes in splashpages test
Fixes #1340
2017-04-05 17:11:11 +05:30
Stella Rouzi
d90d2344d6
Merge pull request #1423 from nikhilgupta1211/splashpage
...
Added Include Venue and Lodgings to the Splashpage components
2017-04-03 13:59:44 +03:00
Ana María Martínez Gómez
f3e712a1bc
Merge pull request #1319 from JewelSam/master
...
#1220 adding the cell size attribute to the database
2017-04-03 10:23:49 +02:00
JewelSam
f6e74461ba
Add schedule interval as attribute of a program
...
Also, the part of the schedule event is deleted and the length of the event types
changes to the nearest suitable after changing the length of the interval.
This closes #1220
2017-04-01 21:39:20 +03:00
Ana María Martínez Gómez
93b185e8d8
Merge pull request #1370 from alator21/move_proposal_edit_to_admin
...
Move proposal edit to admin
2017-03-31 15:53:49 +02:00
gotens1211
bd51be45e5
Added Include Venue and Lodgings to Splashpage components
...
Fixes #1422
2017-03-31 15:26:59 +05:30
gotens1211
73a6e06fd3
Show event time in conference timezone
...
Added an application helper method `time_with_timezone` to return time with the conference timezone which solves the issue of wrong timezone in `scheule.xml` and `admin/events#show`.
Fixes #1188
2017-03-31 13:13:57 +05:30
Alator
8a96bd137c
Added hints for username and name in sign up form and in edit profile
2017-03-28 23:02:40 +03:00
Siddhant Bajaj
e8aa7c8a98
Fixed Venue link in todo list for organiser
...
"Add venue" link in todo list is not active for the organiser of that
conference. Fixes #1383
2017-03-26 00:25:44 +05:30
Chaitanya
e46953e03f
Fix SyntaxError in SchedulesController#events
...
Remove unexpected => from app/views/schedules/_event.html.haml to resolve syntax error
Closes #1404
2017-03-25 10:41:53 +05:30
Alator
d860ec5607
Update proposal link in reports
2017-03-21 19:50:37 +02: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
Siddhant Bajaj
3655c80feb
Fixed registration limit issue
2017-03-13 22:59:02 +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
Stella Rouzi
56c7906d52
Merge pull request #1338 from nasia-sam/change_date_format
...
changed date format in proposals#show
2017-03-08 11:08:24 +02:00
Stella Rouzi
cd997c8e88
Merge pull request #1275 from shlok007/intersecting-events
...
Display concurrent events
2017-03-08 10:51:53 +02:00
nasia
c7e6fb42b7
changed date format in proposals#show
2017-03-07 21:21:00 +02:00
shlok007
4dd10d09ad
display concurrent events on event#show
2017-03-07 20:56:38 +05:30
hitman
226d16dc63
fix markdown issue
2017-03-06 20:57:04 +05:30
Christian Bruckmayer
f85ff0c6c5
Merge pull request #1322 from differentreality/commercial_in_admin_event
...
Commercial in admin/events#show and all links in admin namespace
2017-03-03 13:29:24 +01:00
Stella Rouzi
1772e13523
Shows commercial in admin/events#show and links to admin namespace
2017-03-03 12:43:59 +02:00
Stella Rouzi
2dba9287ae
Provide value for sorting column Confirmed? in admin/users#index
2017-03-03 12:36:42 +02:00
Siddhant Bajaj
dcfc25a541
Show vote versions in event history
2017-03-02 17:07:19 +05:30
gotens1211
c1b81755c9
Implementing Countable.js to count words.
...
Changed the words_count method to work with countable.js
Added the gem for countable.js
2017-03-01 19:15:19 +05:30
Stella Rouzi
8b5d6603af
Merge pull request #1254 from shlok007/devise
...
Updated devise to 4.2.0
2017-03-01 13:29:44 +02:00
Ana
7eb9a57c34
Adapt admin schedule to use the confence hours
2017-02-22 09:17:32 +01:00
