Skip to content

merger #12

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 154 commits into from
Apr 1, 2018
Merged

merger #12

turtles2 merged 154 commits into from
Apr 1, 2018

Conversation

@turtles2
Copy link
Owner

@turtles2 turtles2 commented Apr 1, 2018

No description provided.

asbiin and others added 30 commits January 20, 2018 09:10
@asbiin @djaiss
Add translation for preferences updated successfully message (#797)
8e6da8c
@djaiss
Add ability to export a contact as CSV (#840)
a5a6020
@djaiss
Fix contact field types not being linked to account during vcard impo…
01b6bcf 
…rt (#841)

Fix #838
@djaiss
Add more unit test coverage for money helper (#842)
297be6d
@djaiss
Add more unit tests for Gift model (#843)
a9a6e4c
@asbiin
Add Code Coverage to Browser tests (#813)
4f3994f 
* Using Live-code-coverage to get Code Coverage from http server
* Add a new test to pass Login form
* Add FakeUserTableSeeder to seed in testing env
* Using SESSION_DRIVER=file in travis env
* Add saucelabs connection (disable right now)
* Update composer
@asbiin
Move codecov line (#844)
383c8d8
@djaiss
Add more unit tests for User, Tag, Reminder and PetCategory models (#845
9e08f04 
)
@djaiss
Add final unit tests for DateHelper (#846)
85c2a72
@djaiss
Add more unit tests for Task, User and Tag models (#848)
8217e23
@asbiin
2FA tests cover (#849)
13a304e
@djaiss
More unit tests for many models (#851)
fa69105
@djaiss
Add margin bottom to add contact form (#850)
4384c0e
@djaiss
Do not put specific editor files in gitignore (#855)
49d1586
@djaiss
Bump version to 1.6.2 (#856)
8ee0b84
@asbiin
Some more 2fa test (#854)
e6f8413
@djaiss
Fix avatar being invalid in the Contact API call (#863)
1944190
@djaiss
Add Annual plan (#861)
cc754ca
@djaiss
Fix annual plans generating an error for users exempt of the paid plan (
8974251 
#864)
@tomzx @djaiss
Fix a regression when filtering the list of contacts based on tags (#801
3e40b48 
)
@greenkeeper @djaiss
Update laravel-mix to version 2.0.0 (#847)
1780432
@djaiss
Add requirements section in README (#858)
c9c398d
@djaiss
Revert Laravel mix to 1.7.2 (#866)
000aa04
@djaiss
Remove env variable from prod (#867)
b4577b2
@asbiin
Fix jquery-tags-input name import (#859)
ee94596
@asbiin
Set DB_PREFIX to a real empty string (#873)
b9c6adf
@asbiin
Fix Gitter link and readd badge for sonar (#871)
9370578
@asbiin
Add gifts_update_success (#876)
48acc75
@asbiin
Update changelog with recent changes (#877)
56b001d
@asbiin
Test php 7.2 and postgresql (#785)
94cec0d 
Running:
- php 7.1 + mysql + selenium (browser) tests
- php 7.2 + mysql
- php 7.1 + postgresql
dependabot bot and others added 29 commits March 22, 2018 12:54
@dependabot @asbiin
Bump barryvdh/laravel-debugbar from 3.1.3 to 3.1.4 (#1034)
cd709bd 
Bumps [barryvdh/laravel-debugbar](https://github.com/barryvdh/laravel-debugbar) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/barryvdh/laravel-debugbar/releases)
- [Changelog](https://github.com/barryvdh/laravel-debugbar/blob/master/changelog.md)
- [Commits](barryvdh/laravel-debugbar@v3.1.3...v3.1.4)

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot @asbiin
Bump pragmarx/google2fa from 3.0.0 to 3.0.1 (#1039)
dacfc0f 
Bumps [pragmarx/google2fa](https://github.com/antonioribeiro/google2fa) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/antonioribeiro/google2fa/releases)
- [Changelog](https://github.com/antonioribeiro/google2fa/blob/master/changelog.md)
- [Commits](antonioribeiro/google2fa@v3.0.0...v3.0.1)

Signed-off-by: dependabot[bot] <[email protected]>
@djaiss
Add linkedin url in the Contact object returned by the API (#1042)
39d8071
@djaiss
Fix called_at field in the Call object returned by the API (#1043)
d1559d9
@djaiss
Add with parameter in Contact object to retrieve contact fields (#1044)
ce7ecf5
@djaiss
Add yearly statistics to activities and calls object (#1049)
9d883ec
@dependabot @asbiin
Bump jeroendesloovere/vcard from 1.5.2 to 1.6 (#1038)
cec2b92 
Bumps [jeroendesloovere/vcard](https://github.com/jeroendesloovere/vcard) from 1.5.2 to 1.6.
- [Release notes](https://github.com/jeroendesloovere/vcard/releases)
- [Changelog](https://github.com/jeroendesloovere/vcard/blob/master/CHANGELOG.md)
- [Commits](jeroendesloovere/vcard@1.5.2...1.6)

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot @asbiin
Bump symfony/dom-crawler from 3.0.9 to 4.0.6 (#1033)
f007ef0 
* Bump symfony/dom-crawler from 3.0.9 to 4.0.6
* Bump symfony/css-selector from 3.0.9 to 4.0.6
@carusogabriel @asbiin
Symplify return (#1054)
c52e868
@carusogabriel @asbiin
Use assertCount (#1052)
7f07c1b
@asbiin
I18n improvements (#1060)
006ce9a 
* Add a default locale
* Use html lang and dir attributes
* Fix translations
* Add pluralize forms
@asbiin
Fix i18n improvements (#1061)
6ec2597 
* Fix some codes and pluralize
* Remove urls from locales
@djaiss @asbiin
New Crowdin translations (#1025)
f275f3c
@jkbecker @djaiss
Add reference to Crowdin in the documentation (#1066)
8dfa646
@dependabot @asbiin
Bump guzzlehttp/guzzle from 6.3.0 to 6.3.2 (#1063)
b956585 
Bumps [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) from 6.3.0 to 6.3.2.
- [Release notes](https://github.com/guzzle/guzzle/releases)
- [Changelog](https://github.com/guzzle/guzzle/blob/master/CHANGELOG.md)
- [Commits](guzzle/guzzle@6.3.0...6.3.2)

Signed-off-by: dependabot[bot] <[email protected]>
@asbiin
Use lang list instead of auto (#1068)
1be5e08
@carusogabriel @asbiin
Use unsigned* columns (#1053)
1e1e984
@carusogabriel @asbiin
Use now helper (#1051)
1794435
@asbiin
Fix i18n support (#1069)
f436549 
Fix i18n quotation
Add hreflang on links
Fix lang list on settings which does not appear ! Bug introduced with #1068
@djaiss @asbiin
New Crowdin translations (#1064)
40e8844
@dependabot @asbiin
Bump league/flysystem-aws-s3-v3 from 1.0.18 to 1.0.19 (#1067)
b32eb76 
Bumps [league/flysystem-aws-s3-v3](https://github.com/thephpleague/flysystem-aws-s3-v3) from 1.0.18 to 1.0.19.
- [Release notes](https://github.com/thephpleague/flysystem-aws-s3-v3/releases)
- [Changelog](https://github.com/thephpleague/flysystem-aws-s3-v3/blob/master/changelog.md)
- [Commits](thephpleague/flysystem-aws-s3-v3@1.0.18...1.0.19)

Signed-off-by: dependabot[bot] <[email protected]>
@QueerCodingGirl @asbiin
Fixed usage of wrong success message when adding existing contact as …
dd8484f 
…kid of someone (#1041)
@dependabot @asbiin
Bump creativeorange/gravatar from 1.0.10 to 1.0.11 (#1074)
f59b5b1 
* Bump creativeorange/gravatar from 1.0.10 to 1.0.11

Bumps [creativeorange/gravatar](https://github.com/creativeorange/gravatar) from 1.0.10 to 1.0.11.
- [Release notes](https://github.com/creativeorange/gravatar/releases)
- [Commits](brainpink/gravatar@v1.0.10...v1.0.11)

Signed-off-by: dependabot[bot] <[email protected]>
@asbiin
Order lastname and middlename parameters correctly for contact->setNa…
444f5f5 
…me call (#1073)
@asbiin
Update i18n messages (#1076)
f2ca504
@asbiin
Use phpdbg and other test improvements (#1082)
f601440
@asbiin
Bump google2fa-laravel to version 0.2.0 (#1084)
ab4794f
@asbiin
Fix a duplicate key message (#1085)
e009e40
@asbiin
Split app.js and generate separate javascript language files (#1079)
aa869d5
@turtles2 turtles2 merged commit 48b7362 into turtles2:master Apr 1, 2018
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.