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.

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

2.6.0 update develop from master #2004

Merged
merged 35 commits into from
Feb 25, 2017
Merged

2.6.0 update develop from master #2004

merged 35 commits into from
Feb 25, 2017

Conversation

crossan007
Copy link
Contributor

No description provided.

saulowulhynek and others added 30 commits February 17, 2017 10:08
@saulowulhynek @DawoudIO
Fix #1921 and others untranslated terms (#1923)
d2373cb 
* Fix #1921 and others untranslated terms

Fix #1921 and others untranslated terms

* Apply fixes from StyleCI (#1922)

* Update SystemSettings.php

revert  gettext($category)
@DawoudIO
updated locale
78a8b78
@Adnan0703 @DawoudIO
using select2 for country and state dropdowns (#1926)
491ab4c 
#1407
@DawoudIO
Merge branch 'develop'
b1b194c
@DawoudIO
revert $bHaveXML -> SystemConfig (#1934)
8a2bbb7 
* revert $bHaveXML -> SystemConfig

* fixed style
@DawoudIO
gettext for category names
dc83a82
@Adnan0703 @DawoudIO
person image, family image overlay (#1935)
b42388b 
* person image, family image overlay

#615

* removed upload and delete image buttons
@DawoudIO
2.6.0 RC3 updates
378e3e0
@crossan007
fixes #1937
cbbbdae
@crossan007
consistent upgrade naming
cdcd74d
@crossan007
fix versions
4a2375d
@crossan007
Merge pull request #1949 from ChurchCRM/2.6.0-1937-fix-restore-fail
f506cf0 
fixes #1937
@crossan007
closes #1939 and #1938
6e7832d
@crossan007
try fixing builds
01094ce
@crossan007
Merge pull request #1958 from ChurchCRM/2.6.0-fix-builds
4f0c461 
try fixing builds
@crossan007
Merge branch 'master' into 2.6.0-1398-fix-group-images
4a6d632
@crossan007
Merge pull request #1957 from ChurchCRM/2.6.0-1398-fix-group-images
623a977 
closes #1938 and #1939
@crossan007 @DawoudIO
2.6.0 1948 fix backup (#1952)
e916116 
* Cleanup Backup Utility

* Cleanup restores

* fix sql.gz

* ignore all temp attach files

* Apply fixes from StyleCI
@crossan007 @DawoudIO
update release guidelines (#1950)
26c26f4 
* update release guidelines

* update release guidelines
@Adnan0703 @DawoudIO
volunteer opportunity assignment fixes (#1961)
6f94edc 
* volunteer opportunity assignment fixes

table and form style fixes and using select2 for multiselect
#1944

* removing jquery styles

#1968

* using datatable for assigned volunteer opportunities

* using datatable for assigned properties

for #1945

* more fixes
@DawoudIO
Apply fixes from StyleCI (#1979)
4c2e218
@simonkp @DawoudIO
Geopage fixes (#1885)
f908da1 
Change the geopage family select box to select2 so that select is
enabled.
Change Queries to ORM
Change the Address filed to show full address in one column rather than
showing different fields.
@DawoudIO
Apply fixes from StyleCI (#1980)
cf657ff
@DawoudIO
updated file numbers
ac29b82
@DawoudIO
Update for RC4
502260e
@DawoudIO
downloaded after uploading RC4 file
f6a9388
@bradgearon @DawoudIO
using system config header or church name if !empty for self registra…
ba85535 
…tion (#1991)

resolves #1758
@bradgearon @DawoudIO
resolves #1789 (#1990)
4311098
@DawoudIO
Apply fixes from StyleCI (#1994)
477aeef
@crossan007 @DawoudIO
fix login on restart vm (#1999)
65d9396
@crossan007 crossan007 mentioned this pull request Feb 25, 2017
Closed
@crossan007 crossan007 merged commit 729b7f8 into develop Feb 25, 2017
@crossan007 crossan007 deleted the 2.6.0-update-develop-from-master branch February 25, 2017 17:33
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
development
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@crossan007 @DawoudIO @saulowulhynek @Adnan0703 @simonkp @bradgearon