Chaitanya
0e8e626156
Allow to view schedule without login
...
Add show and events action's can abilities of schedule for not_signed_in user in order to make schedule available to view without login.
Closes #1343
2017-03-24 20:52:27 +05:30
Ana María Martínez Gómez
4b418238d2
Merge pull request #1378 from BelieveC/EnableDoubleNegation
...
Fixes #1374 to Enable Style/DoubleNegation Rubocop
2017-03-21 11:44:56 +01:00
Stella Rouzi
5e9bc683ae
Move reports to separate controller
2017-03-20 17:51:37 +02:00
Stella Rouzi
a325eccc77
Merge pull request #1358 from divyanshumehta/issue_1326
...
Changed Ruby syntax in views
2017-03-20 17:19:28 +02:00
Chaitanya
7de009e46e
Enable Style/DoubleNegation Rubocop cop
...
This cop checks for uses of double negation (!!) to convert something to a boolean value. It doesn't support autocorrection, so all the offenses where manually solved.
Closes #1374
2017-03-20 19:12:40 +05:30
divyanshumehta
1ca448df6f
Changed Ruby syntax in views. Fixed #1326
2017-03-20 18:27:39 +05:30
Ana María Martínez Gómez
125a7fe29a
Merge pull request #1309 from commandprompt/bug_1298_fix_pr
...
fixes bug OSEM#1298
2017-03-17 15:44:47 +01:00
Alberto Miedes Garcés
e5aa6ab868
Fix bug in User#registered_to_event?
...
Fix exception being thrown in `User#registered_to_event?` when the user
is not registered in the corresponding event conference.
2017-03-17 11:26:47 +01:00
Hernán Schmidt
d4b9ea48f9
Merge pull request #1320 from nikhilgupta1211/nav_collapse
...
changed navbar dropdown for small devices. fixes #1380
2017-03-16 21:42:20 +01:00
Ana María Martínez Gómez
a5a6c81cd9
Merge pull request #1355 from chashmeetsingh/master
...
Update error message
2017-03-15 15:27:41 +01:00
Chashmeet Singh
43dbb153c2
fix : #1345 (remove duplicate text in error message)
2017-03-14 22:32:24 +05:30
Siddhant Bajaj
3655c80feb
Fixed registration limit issue
2017-03-13 22:59:02 +05:30
gotens1211
9c2a09eaf2
changed dropdown for small devices
2017-03-11 08:48:21 +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
77c7bdfecf
Merge pull request #1266 from AEtherC0r3/fix_unreachable_code
...
Remove the unreachable code and modify the error message in ConferenceRegistrationsController#new
2017-03-08 10:55:27 +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
AEtherC0r3
88e1646e87
Fix unreachable code ( #1140 ) in ConferenceRegistrationController#new
...
Remove the unreachable code from ConferenceRegistrationController#new
Rework the error message logic in ConferenceRegistrationController#new
Fix redirect to #edit when the user is registered
Refactor ConferenceRegistrationController#new spec and add more tests
2017-03-07 17:40:19 +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
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
Ana María Martínez Gómez
acc4cc3aef
Merge pull request #1283 from siddhantbajaj/Voteschange
...
show vote changes
2017-03-02 14:10:39 +01:00
Christian Bruckmayer
ff65b3b601
Merge pull request #1243 from cniedzwiedz/squash_test
...
Fixed XSS in markdown() method
2017-03-02 14:01:51 +01: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
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
Eugene Dubinin
09696a4518
fixes bug OSEM#1298
2017-02-28 18:46:18 +02:00
Ana María Martínez Gómez
ebb5203887
Exclude conference model from ClassLength cop
...
Exclude conference.rb file from ClassLength Rubocop cop and decrease the
max value of this cop to 300, as the following class in number of lines is
event.rb with 218.
Also, remove unused comments from Conference model class.
2017-02-22 17:08:51 +01:00
Ana
bde2ee3d7d
Delete Eventschedules out of conference hours
2017-02-22 09:17:34 +01:00
Ana
b3bbaf87a4
Adapt public schedule to use the confence hours
2017-02-22 09:17:34 +01:00
Ana
7eb9a57c34
Adapt admin schedule to use the confence hours
2017-02-22 09:17:32 +01:00
Ana
9b9d255e3b
Add fields in conference edit form for hours
...
Make possible to change the start and end hours.
2017-02-22 09:09:29 +01:00
Ana
b80aff3cce
Add times to Conference
...
Add start hour and end hour to conference to be able to make the schedule times changeable
2017-02-22 09:09:29 +01:00
Christian Bruckmayer
0d6ba56e55
Merge pull request #1304 from nikhilgupta1211/register_date
...
conference_registrations#new prefilled times
2017-02-20 10:20:49 +01:00
Christian Bruckmayer
b725bde890
Merge pull request #1296 from JewelSam/master
...
#1040 Show email in public option
2017-02-20 09:56:45 +01:00
gotens1211
82db583217
Default date removed from conference registrations.
2017-02-20 08:57:27 +05:30
Stella Rouzi
cf29150a2a
Merge pull request #1290 from siddhantbajaj/dropdown
...
Fixed dropdown issues in admin/events#show page
2017-02-16 10:56:33 +02:00
Stella Rouzi
3f21d1bc37
Merge pull request #1288 from siddhantbajaj/Eventindex
...
fixed dropdown issue
2017-02-16 10:56:00 +02:00
Stella Rouzi
e0e7d83aa0
Merge pull request #1270 from siddhantbajaj/schedule
...
Fixed schedule creation when there is no room.
2017-02-16 10:48:56 +02:00
Siddhant Bajaj
1d4615e297
fixed schedule creation
2017-02-16 00:01:40 +05:30
Siddhant Bajaj
3a9d7b9e1f
fixed dropdown issues on Event Index page
2017-02-15 23:43:17 +05:30
Siddhant Bajaj
289a8393c8
fixed dropdown issue
2017-02-15 23:39:02 +05:30
JewelSam
56c69f51b7
#1040 Show email in public option
2017-02-14 17:54:31 +03:00
Hernán Schmidt
a0120734e3
Merge pull request #1287 from sheamunion/issue-1273
...
Issue 1273
2017-02-12 19:59:52 +01:00
shlok007
a2b3396897
rename intersecting_events to intersecting_event_schedules
2017-02-12 19:10:03 +05:30
