Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Push changes from master to staging on 2018-06-26 #2372

Merged
merged 32 commits into from
Jun 26, 2018
Merged

Push changes from master to staging on 2018-06-26 #2372

merged 32 commits into from
Jun 26, 2018

Conversation

cgolubi1
Copy link
Contributor

@cgolubi1 cgolubi1 commented Jun 25, 2018

This update brings these approved pulls to the staging branch:

Database updates:

UPDATES="02333_reenable_oregon_01.sql 01167_php7_01.sql 02347_tl_status_01.sql"

Once this pull is merged, i will load the changes on staging.buttonweavers.com as part of #2371.

blackshadowshade and others added 30 commits April 7, 2018 19:48
- Added extra logic to allow both forum and post IDs to be specified
- Added forum markup for each post
Added forum markup to link to other forum threads
Don't verify SSL cert when downloading phpunit
Add a CircleCI step which tries to verify that the dummy API files have landed before running QUnit
…m_bug

Fixed bug with skill attack containing more than two zero-sided dice
replay_loop should retry tar command
…exception

Fixed spurious turbo-fire-radioactive internal error
Removed "Any button" option when filters are selected
Added Jota's page that converts XLS-pasted tables into forum tables
Add Oregon to responderTest's skill descriptions
…_description

Added description of interaction between mighty/weak and chance
Fix typo in error message causing retry not to work
@cgolubi1
Copy link
Contributor Author

I should be able to merge this in the morning: i want to test on a sandbox prior to staging, given that there are three database files from unrelated commits.

@blackshadowshade
Copy link
Contributor

Oh, Scipio found the 0-sided skill attack bug. XD

http://www.buttonweavers.com/ui/forum.html#!threadId=646

@cgolubi1
Copy link
Contributor Author

Hah. I should have more faith in our users. Moving it to the "user-visible changes" section.

@cgolubi1 cgolubi1 changed the title Push changes from master to staging on 2018-06-24 Push changes from master to staging on 2018-06-26 Jun 26, 2018
@cgolubi1
Copy link
Contributor Author

Okay, FINALLY merging so i can test under virtualbox.

@cgolubi1 cgolubi1 merged commit 29f6c05 into staging Jun 26, 2018
@cgolubi1
Copy link
Contributor Author

Seems fine at a glance; updating live staging site.

@cgolubi1
Copy link
Contributor Author

Done. Check it out folks, and barring complaints, i'll try to push to prod Thursday morning.

@dwvanstone
Copy link
Contributor

The "Oregon" button doesn't specify that its sizes need to be unique.

(Compare with Gordo & Guillermo which both have Special text specifying this restriction.)

Everything else looks good in my testing.

@cgolubi1
Copy link
Contributor Author

dwvanstone: okay, should be fixed - try now. Thank you!

@dwvanstone
Copy link
Contributor

Looks good!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants