Skip to content

Merge Upstream #4

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.

Sign up for GitHub

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

Jump to bottom
Merged
turtles2 merged 6 commits into from
Jan 2, 2018
Merged

Merge Upstream #4

turtles2 merged 6 commits into from
Jan 2, 2018

Conversation

@turtles2
Copy link
Owner

@turtles2 turtles2 commented Jan 2, 2018

Checklist

Before submitting the PR

  • Read the CONTRIBUTING document before submitting your PR.
  • If the PR is related to an issue or fix one, don't forget to indicate it.
  • Make sure that the change you propose is the smallest possible.
  • Screenshots are included if the PR changes the UI.

Code-related tasks

  • Tests added for this feature/bug.
  • Impact on the seeders.
  • Impact on the API.

If the code changes the SQL schema

  • Impact on account export.
  • Impact on importing data with vCard and .csv files.
  • Impact on account reset and deletion.

Other tasks

  • CHANGELOG entry added, if necessary, under UNRELEASED.
  • CONTRIBUTORS entry added, if necessary.
  • If it's relevant, add the documentation about your feature in the README file.
  • Indicate [wip] in the title of the PR it is is not final yet. Remove [wip] when ready. Otherwise the PR will be considered complete and rejected if it's not working.

turtles2 and others added 6 commits January 2, 2018 09:27
@turtles2 @djaiss
Change wording on Update debt (#727)
73e7c0d 
Fix #350
@djaiss
Bump version to 1.5.0 (#737)
61b8e0f
@hexnet @djaiss
Change link to repository in the documentation (#728)
649dd46 
Change to git clone URL as the git@ will not work without a granted private key.
@mwalling @djaiss
Fix URL::forceSchema to forceScheme (#730)
8a96eac
@mwalling @djaiss
Fix an issue where February shows up as March in the date picker (#731)
8bbae23 
When the current day of the month is greater than the number of days in
the month, the date class was rolling forward to March.
@turtles2 @djaiss
Allow searching by phone number (or contact fields in general) (#735)
1094132 
This will allow a user to search there contacts by there contact information. It is done by entering the field they are searching by followed by a : then the search term. For example to find a contact with the email [email protected] you would enter email:[email protected]. 

Fixes #729
@turtles2 turtles2 merged commit 1c266d4 into turtles2:master Jan 2, 2018
turtles2 added a commit that referenced this pull request Jan 4, 2018
@turtles2
Testing Fix #4
3b1df8f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@turtles2 @mwalling @Kovah @djaiss @hexnet