rahul2240
2affec9614
Regenerate rubocop_todo file
...
Todo file is regenerated because of the changes in the new version of Rubocop.
We are following the default Rubocop configuration.
closes https://github.com/openSUSE/osem/issues/1815
2017-11-28 16:18:06 +05:30
rahul2240
9cf3f63bae
Update rubocop to 0.51.0
...
Rubocop is updated to version 0.51 from 0.49
2017-11-28 16:17:11 +05:30
Jesús
cf3aeda1d2
Fixing admin user creation in docker
...
Added db:seed in order to have the deleted user, and be able to have an admin user.
2017-11-24 21:41:08 +01:00
James Mason
8442eb813f
Merge pull request #1807 from ViditChitkara/ticket_turnover
...
fixed tickets turnover bug
2017-11-21 17:31:41 -08:00
ViditChitkara
38342cd557
fixed tickets turnover bug
...
closes #1473
2017-11-21 13:24:47 +05:30
James Mason
22247a0ac2
Merge pull request #1792 from bear454/ssl-opt
...
Control config.force_ssl with an ENV variable
2017-11-19 13:43:54 -08:00
James Mason
fb4bafb296
Merge branch 'master' into ssl-opt
2017-11-17 09:45:51 -08:00
Ana María Martínez Gómez
9603cf5173
Merge pull request #1802 from Ana06/yajl-vulnerability
...
Update yajl-ruby to 1.3.1
2017-11-17 10:43:54 +01:00
Ana María Martínez Gómez
9885b3617f
Update yajl-ruby to 1.3.1
...
There is a security vulnerability in yajl-ruby 1.3.0:
In the yajl-ruby gem 1.3.0 for Ruby, when a crafted JSON file is
supplied to `Yajl::Parser.new.parse`, the whole ruby process crashes
with a `SIGABRT` in the `yajl_string_decode` function in
`yajl_encode.c`. This results in the whole ruby process terminating and
potentially a denial of service.
Reference:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-16516
2017-11-17 10:07:02 +01:00
James Mason
3239b74444
Merge pull request #1797 from evris99/travis_changes
...
Changed db:migrate to db:schema:load
2017-11-16 20:08:12 -08:00
James Mason
42ab3b9968
Merge branch 'master' into travis_changes
2017-11-16 19:44:52 -08:00
James Mason
67d604cf40
Merge pull request #1801 from namangupta01/test1
...
schema updated
2017-11-16 19:44:00 -08:00
James Mason
ee6040ffd6
Merge branch 'master' into ssl-opt
2017-11-16 18:13:38 -08:00
Naman Gupta
e32837b3b1
schema is added
2017-11-17 00:41:20 +05:30
evris99
f2d3813986
Changed db:migrate to db:schema:load
2017-11-16 18:34:47 +02:00
James Mason
1989438e89
Merge pull request #1777 from bear454/recaptcha
...
reCAPTCHA on sign up (BONUS: Features)
2017-11-15 12:38:40 -08:00
James Mason
eca09dd7d6
Merge branch 'master' into recaptcha
2017-11-15 11:58:15 -08:00
ViditChitkara
c3872c9bd0
added email presence validation to openid
...
closes #1658
added test for openid
fixed robocup offences
written tests for email presence validation
minor changes
shifted omniauth callback tests to rspec controllers
fixed linting bug
minor changes
minor changes
2017-11-15 18:02:17 +05:30
James Mason
668c7dede9
Add FORCE_SSL to the dotenv example
2017-11-14 14:12:23 -08:00
James Mason
207319ae57
Control config.force_ssl with an ENV variable
2017-11-14 14:12:23 -08:00
James Mason
bf219ec015
Merge pull request #1785 from bear454/test-fix
...
Fix a flaky test.
2017-11-14 14:09:21 -08:00
James Mason
7f369507d2
Merge branch 'master' into test-fix
2017-11-14 12:37:33 -08:00
James Mason
84dedb42c3
Merge pull request #1793 from bear454/switch-transifex
...
Only include transifex JS if the ENV var is set
2017-11-14 12:36:02 -08:00
James Mason
3490644a4d
Merge branch 'master' into switch-transifex
2017-11-14 08:06:50 -08:00
rahul
4785293bf1
Add hint in start and end hour in conference#edit
2017-11-14 17:53:44 +02:00
rahul
837d8ec0db
Add popup confirmation on update button
...
Popup is added so user can confirm the changes
Closes https://github.com/openSUSE/osem/issues/1687
2017-11-14 17:53:44 +02:00
ViditChitkara
bd045c2976
added description field to cfps
...
closes #1650
done some changes
minor changes
added markdown format to cfp#show
fixed description text position in proposals
fixed truncated description text in show action
minor changes on non-admin side
2017-11-14 17:31:08 +02:00
James Mason
fba12aef24
Only include transifex JS if the ENV var is set
...
... otherwise, don't bother loading this blocking external resource.
2017-11-12 20:43:02 -08:00
James Mason
0e16b5d0ae
Merge pull request #1790 from adrianovieira/fix_speaker.email_public
...
Fix to only show speaker email if it's public
2017-11-12 17:46:39 -08:00
Adriano Vieira
6fa709a4de
Fix to only show speaker email if it's public
2017-11-12 01:55:03 -02:00
James Mason
906c05ec4e
Merge branch 'master' into test-fix
2017-11-09 08:39:59 -08:00
James Mason
81831d7df9
Merge pull request #1787 from namangupta01/program_speakers
...
programs.speakers now gives all speakers
2017-11-09 08:39:45 -08:00
Naman Gupta
d0dbb7d29e
tests are fixed
2017-11-09 02:39:41 +05:30
Naman Gupta
ada0f814a7
linting error is fixed
2017-11-09 02:00:49 +05:30
Naman Gupta
90edc648f8
programs.speakers is fixed
2017-11-09 01:40:56 +05:30
James Mason
ce4e993fe7
Merge branch 'master' into recaptcha
2017-11-08 09:33:03 -08:00
James Mason
20b849d9ce
Merge branch 'master' into test-fix
2017-11-08 09:32:19 -08:00
James Mason
aeded80a11
Merge pull request #1762 from namangupta01/include_speaker_email_in_events
...
Speaker emails in Events CSV/XLS export is included
2017-11-07 18:22:24 -08:00
James Mason
574ac63a05
Fix a flaky test.
2017-11-07 17:59:11 -08:00
James Mason
aca8adf6e8
Merge branch 'master' into include_speaker_email_in_events
2017-11-07 17:19:42 -08:00
James Mason
51dd5bdaa9
Merge pull request #1757 from bear454/organization-link
...
Fix missing link on public organizations page
2017-11-07 17:17:39 -08:00
James Mason
1c623b1c8a
Merge branch 'master' into organization-link
2017-11-07 14:32:35 -08:00
James Mason
503ee81db0
Merge pull request #1784 from bear454/nav-title-link
...
Use organization name for title link if available, but link to /
2017-11-07 14:32:23 -08:00
James Mason
714f89f6ba
Fix missing link on public organizations page
...
When viewing a conference, the Instance Name in the header points to
/organizations. On the organizations index, there's a button to see
conferences, but it does nothing. This makes it easy for public users to
get lost.
This commit:
* Adds a function to the organizations controller to show child
conferences
* Adds a public permission to see conferences through an organization
* Represents a subset of conferences, reusing conferences/index view,
for the organization
2017-11-07 14:11:13 -08:00
James Mason
6feb2e853a
Merge branch 'master' into nav-title-link
2017-11-07 14:09:33 -08:00
James Mason
170051af81
Merge pull request #1779 from adrianovieira/update_bootstrap_for_centos
...
Update bootstrap for centos box
2017-11-07 13:53:53 -08:00
James Mason
1b8f864feb
Use organization name for title link if available, but link to /
2017-11-07 13:51:10 -08:00
James Mason
04d79f65a5
Merge branch 'master' into update_bootstrap_for_centos
2017-11-07 13:20:31 -08:00
Naman Gupta
94de2e813c
test is fixed
2017-11-08 01:41:42 +05:30
Naman Gupta
2e07462d77
exports are made to be wrap_text
2017-11-08 00:49:03 +05:30
