Current WIP #414
Closed
Current WIP #414
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This will probably need someone caring about it, because if anyone ever tries to upgrade their MySQL version, I'm not actually sure what will happen with invalid data like this. It probably will be worth testing. Probably a good idea to have an upgrade script that updates everything in the database as part of 3.6?
Also, ran a php -l over everything, no more syntax errors with short_tags turned off. Yay!
There is a typo in line 120 making cdrs displaying only callerID name and not callerID number. This issue was found in v3.5 too: https://github.com/iNextrix/ASTPP/pull/320/files
… auto generated invoice date as start date
[FIx] If user will enter domain/ip in company profile with/without http or https, then also logo will show properly on login page.
Fix the fix - Do not specify protocol.
Added link for cloud hosting and G729 license
Added link for cloud hosting and G729 license
When https is implemented, there's an error that marks site as "not secure" because site uses https but loads scripts that are http.
Solve two issues 1. Default Country,Timezone and Currency value set when mass create popup open. =>Add select picker refresh code after set dropdown value in jquery. 2. when change 'Billing Schedule' dropdown that time all dropdown value set statically 2 =>remove static code in on-change function.
|
Most of the conflicts are either ^M repairs, or short-php-opens. I haven't looked too hard. Also, I haven't even checked if this code works, this was just getting my branch up to date with yours. There may be more commits coming. |
That appears to be the equivlant of 'limit 1', but there isn't any reason to do so, unless invoice numbers are duplicated.
This relates to iNextrix@3bc5781
Lint passed again: [root@astpp-1 astpp]# find . -name \*.php | xargs -l php -l | grep -v No\ syn [root@astpp-1 astpp]# [
Globally s/freeswith/freeswitch/
|
Hi @xrobau Thanks for the updates. |
|
The merge conflicts aren't really fixable, if you look through them, because they're differences in the entire file (eg, remove ^M's) or different ways of doing things. You get to pick what you want to merge 8) Github has a surprisingly good 'resolve conflicts' button. |
|
Alright. I will look at that.
[image: Mailtrack]
<https://mailtrack.io?utm_source=gmail&utm_medium=signature&utm_campaign=signaturevirality4&>
Sender
notified by
Mailtrack
<https://mailtrack.io?utm_source=gmail&utm_medium=signature&utm_campaign=signaturevirality4&>
Best Regards
--
Samir Doshi
*iNextrix Technologie**s Pvt. Ltd*.
http://www.inextrix.com
*Disclaimer:*
The information contained in this communication is confidential and may be
legally privileged. It is intended solely for the use of the individual or
entity to whom it is addressed and others authorized to receive it. If you
are not the intended recipient you are hereby notified that any disclosure,
copying, distribution or taking action in reliance on the contents of this
information is strictly prohibited and may be unlawful. Please notify the
sender immediately and destroy all copies of this message and any
attachments contained in it.
…On Thu, May 3, 2018 at 11:51 AM, Rob Thomas ***@***.***> wrote:
The merge conflicts aren't really fixable, if you look through them,
because they're differences in the entire file (eg, remove ^M's) or
different ways of doing things. You get to pick what you want to merge 8)
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
<#414 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AA6gceMQIbd3Pg7mGRGvt7fIiHZSe4WSks5tuqHhgaJpZM4TrLwM>
.
|
|
I'm not going to persevere with this pull request, as it's just getting more and more stale. Plus commits like 309a35a where one file was randomly placed inside another (breaking all CDRs) really disheartens me. |
|
Hi Rob,
That was unfortunate bug and I hope there will not be any other.
How would you like to keep your branch running?
…On Sun 13 May, 2018, 4:33 AM Rob Thomas, ***@***.***> wrote:
Closed #414 <#414>.
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
<#414 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AA6gcZxovK3PWXnNq4brRfs8lMMvjx61ks5tx2otgaJpZM4TrLwM>
.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the 3.6 branch with all the current fixes applied, APART from the ones I mentioned in glitter.
Also:
** Note this uses 01-01-1980 as a replacement for the (invalid) 00-00-0000 datestamp. The better way to do that is to allow NULL datestamps, which is partially done
This would be a good starting point for 3.7!