Dimitris
7fd738bc7d
Add option to render html at format_helper
2017-06-27 18:30:26 +03:00
Ana María Martínez Gómez
53040b3be9
Merge pull request #1498 from divyanshumehta/issue_1497
...
Added Style/SpaceInsideBrackets Rubocop cop
2017-06-12 17:45:30 +02:00
selini
9ff3601453
remove unnecessary functions
2017-06-12 12:31:31 +03:00
selini
071ed50acb
Hide recent Registrations/Submissions when conference is over
2017-06-12 12:31:31 +03:00
divyanshumehta
1223fef87c
Use of rubocop compliant unescaping methods in application_helper.rb
2017-06-11 22:57:52 +05:30
Agrim Mittal
255744268b
shift relevant functions to versions_helper
2017-05-26 15:47:01 +03:00
Agrim Mittal
b4c2eeb772
change name to versions_helper
2017-05-26 15:47:01 +03:00
hitman
60afb2a474
refractor can_manage_volunteers?
2017-05-26 15:47:01 +03:00
hitman
dbffece956
remove !! from can_manage_volunteers
2017-05-26 15:47:01 +03:00
hitman
4fbb7db16b
modify event_type function
2017-05-26 15:47:01 +03:00
hitman
b36d02ceec
change to can_manage_volunteers?
2017-05-26 15:47:01 +03:00
hitman
85fa39870d
relocate some functions
2017-05-26 15:47:01 +03:00
hitman
c6203a4ed4
rearrange helper functions
2017-05-26 15:47:01 +03:00
hitman
bb0857cbad
remove unnecessary includes from ApplicationHelper
2017-05-26 15:47:01 +03:00
hitman
a5d637fcf1
add documentation for each helper
2017-05-26 15:47:01 +03:00
hitman
5dece1ea48
refractor code into different files
2017-05-26 15:47:01 +03:00
hitman
d9925f00e9
add volunteers helper
2017-05-26 15:47:01 +03:00
hitman
2e0f7e9b42
relocate some functions
2017-05-26 15:47:01 +03:00
hitman
5b1a730e19
rearrange helper functions
2017-05-26 15:47:01 +03:00
hitman
e2657bb10d
refractor code into different files
2017-05-26 15:47:01 +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
hitman
e73baa2754
add validation for name, used and quantity
2017-05-13 18:30:30 +03:00
selini
8a0f3c99b0
Create links for speakers in admin/reports#index
2017-05-10 10:34:45 +03:00
Ana María Martínez Gómez
fd6d0bf39b
Merge pull request #1446 from sunny-b/master
...
Enable Style/DotPosition Rubocop cop
2017-04-07 11:21:34 +02:00
Sunny
03fa299058
enable style/dotposition rubocop cop
2017-04-06 23:19:58 -04:00
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
Stella Rouzi
cd997c8e88
Merge pull request #1275 from shlok007/intersecting-events
...
Display concurrent events
2017-03-08 10:51:53 +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
hitman
040db7990b
change escape_html: false to true
2017-03-06 18:38:45 +05:30
Christian Bruckmayer
ff65b3b601
Merge pull request #1243 from cniedzwiedz/squash_test
...
Fixed XSS in markdown() method
2017-03-02 14:01:51 +01:00
gotens1211
ec1adbada8
Removed duplicate methods date_range_string and date_string.
...
Added tests for date_string function
corrections in the test
2017-03-01 15:39:10 +05:30
shlok007
a2b3396897
rename intersecting_events to intersecting_event_schedules
2017-02-12 19:10:03 +05:30
shlok007
3065766da9
ability to track resources used in conference
2017-02-07 14:58:45 +05:30
Nishanth Vijayan
5111d9e937
Extract checking if event is replacement to event_schedule model
2017-01-20 18:54:56 +02:00
Nishanth Vijayan
9c7591adcd
Add cancel/replacement labels in All Events
...
Extract replacement/canceled label & notice logic to helpers
Join replacement/canceled label and notice and move to top
2017-01-20 18:54:35 +02:00
Chris Niedzwiedz
d2e177cac4
Testing if I can squash this way ( #1 )
...
* Fixed XSS resulting from markdown() method
2017-01-09 12:27:11 -06:00
differentreality
ea868d4cc7
voting period is open when voting dates are not set
2016-11-24 19:09:35 +02:00
Stella Rouzi
6c39d34322
Merge pull request #1159 from nishanthvijayan/changelog-improvements
...
Misc improvements to Revision History
2016-11-21 19:21:02 +02:00
richiethomas
daf1f805bd
Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController'
2016-09-30 18:49:44 -04:00
Nishanth Vijayan
b30afccfba
When displaying changes, use '-' if id of associated object is blank
2016-09-26 17:21:45 +05:30
Nishanth Vijayan
75ee1371de
Cleanup obj_desc_and_link
2016-09-26 17:21:45 +05:30
Nishanth Vijayan
7d70f7685e
Track Schedule and EventSchedule
2016-09-26 17:21:45 +05:30
Nishanth Vijayan
b982d18bbb
Use name/title instead of ID for associated object when showing changes
2016-09-26 17:21:45 +05:30
Nishanth Vijayan
48828f8930
Display who added commercial for event
...
Activate versioning for tests
The tests were failing because of the lack of versioning.By default, versioning is off for tests.
As a result, here (app/views/proposal/_form.html.haml L43) commercial,versions.last returns nil as there are no versions.
2016-08-20 14:21:21 +05:30
charliequinn
ef9ba3b981
Added specs for ApplicationHelper.show_time
...
- refactor of code to use divmod and handle decimal number parameter
- return '0 h 0 min' if length blank
2016-08-17 13:55:29 +01:00
Stella Rouzi
99992750bb
Merge pull request #1128 from nishanthvijayan/event-changelog
...
Improve event history page
2016-08-16 18:23:56 +03:00
charliequinn
89d45f62a0
Bug fix nil parameter ApplicationHelper.markdown
...
Added specs for nil value parameter and header markdown
2016-08-16 00:33:32 +01:00
Nishanth Vijayan
e2659ae907
Show changes to event commercials in event changelog
2016-08-15 18:18:03 +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
