search

Scripler / scripler

The Scripler web application source code repository
Do What The F*ck You Want To Public License
5 stars 1 forks source link

Issue 1083 and merge fix #1085

Closed allanmc closed 8 years ago

allanmc commented 8 years ago

@mortengf Review please. A fix for #1083.

But i also discovered a lot of old changes that seems to have been lost since the last alpha2<->beta1 merge :( I fixed the ones i discovered by copying those changes from the alpha2 branch. But theres most likely more missing commits.

I readded some changes from the following commits: 032152e7319faf263b08518075717f4a27c9eade 7a5de1a6d11c21ad1c7edbbae23eaf710393ee2f 14b96e723a97c80e9a60f9e2b3b7af35510f66ba

mortengf commented 8 years ago

Besides e54ff85 and the changes in the three commits I already reviewed (in May), did you make any other changes? If not, then approved.

And yes, real sucky about the crazy merge. :(

allanmc commented 8 years ago

In f157165 i had to manually merge your loadWithoutPremiumCheck into the "new" genricLoad funciton.

Otherwise no other new code.

Btw - your review of genericLoad is here:) https://github.com/Scripler/scripler/pull/1021

mortengf commented 8 years ago

Hehe, ok. Approved :dancers: