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.

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

Time line updates #2914

Merged
merged 22 commits into from
Jul 28, 2017
Merged

Time line updates #2914

merged 22 commits into from
Jul 28, 2017

Conversation

DawoudIO
Copy link
Contributor

@DawoudIO DawoudIO commented Jul 24, 2017

Should be merged after #2912

@DawoudIO DawoudIO added this to the On-Deck milestone Jul 24, 2017
@ghost ghost assigned DawoudIO Jul 24, 2017
@ghost ghost added the In Review label Jul 24, 2017
@DawoudIO DawoudIO requested a review from crossan007 July 24, 2017 05:25
@DawoudIO
Copy link
Contributor Author

this is now ready

@@ -40,12 +40,12 @@ public function getDeleteLink()
return SystemURLs::getRootPath().'/NoteDelete.php?NoteID='.$this->getId();
}

public function getDisplayEditedDate()
public function getDisplayEditedDate($format = 'Y-m-d h:i:s')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be "sDateTimeFormat" - #1495

$family = FamilyQuery::create()->findPk($iFamilyID);
$family->createTimeLineNote('create');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to work on getting these pages to use the ORM, as this should be handled by the PostInsert / PostUpdate.

Linking #2284

$family = FamilyQuery::create()->findPk($iFamilyID);
$family->updateLanLng();
$family->createTimeLineNote('edit');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to work on getting these pages to use the ORM, as this should be handled by the PostInsert / PostUpdate.

Linking #2284

@DawoudIO DawoudIO merged commit 7ccc0a8 into master Jul 28, 2017
@ghost ghost removed the In Review label Jul 28, 2017
@DawoudIO DawoudIO deleted the time-line-updates branch July 28, 2017 01:37
@DawoudIO DawoudIO modified the milestones: 2.8.9, On-Deck Jul 28, 2017
DawoudIO pushed a commit that referenced this pull request Aug 13, 2017
* Enabled Google Profile Photos

* Update SystemConfig.php

Add two new constant :
- on for the delimiter
- the second for the charset

* Update InputUtils.php

The translate_special_charset function

* Update CSVCreateFile.php

The main export.

* Update SundaySchoolClassListExport.php

Same too

* Update PDFLabel.php

Same too

* Apply fixes from StyleCI (#2923)

* Apply fixes from StyleCI (#2926)

* Family Self Activity Reports (#2912)

* removing person Id magic numbers

self reg and self verify

* new API to terutn self registered families

* import cleanup

* 1st comit

* fixed null classification

* added /self-verify

fixed max return to 100 and order desc

* created

* added self reg and self verify reports

* using static vars not magic numbers

* moving from static var to const

* Added a report of families with valid self Verify links (#2929)

* removing person Id magic numbers

self reg and self verify

* new API to terutn self registered families

* import cleanup

* 1st comit

* fixed null classification

* added /self-verify

fixed max return to 100 and order desc

* created

* added self reg and self verify reports

* using static vars not magic numbers

* moving from static var to const

* using const for types

* added pending-self-verify

* created a page to list of families with pending self verify links

* starting 2.8.9

* updated AU

* regen from 2.8.0 code

* line changes no new translation

* updated FR

* updated ES

* moved to wiki

https://github.com/ChurchCRM/CRM/wiki/default.schema

* new BR terms

* added pt_BR

* Fixed en_* locale js files (#2930)

* Time line updates (#2914)

* removing person Id magic numbers

self reg and self verify

* new API to terutn self registered families

* import cleanup

* 1st comit

* fixed null classification

* added /self-verify

fixed max return to 100 and order desc

* created

* added self reg and self verify reports

* using static vars not magic numbers

* fixed checking for null/empty/0 last edited dates

* fixed a bug where 2 timeline items at the same time show as 1

also added verify-link

* added verify link

* using standard $family->verify call

* bug fixes

fixed timeline adding a 2nd created line
fixed if checking = vs ==
fixed verify
moving createTimeLine to public

* using common createTimeLineNote

* support years by timeline

* Apply fixes from StyleCI (#2913)

* moving from static var to const

* now 2.8.10

* Added a comment column (#2947)

* central file for all locales

* using src/locale/locales.json for POEditor download

* New terms for 2.8.10

* New terms for 2.8.10

* New terms for 2.8.10

* fixed gettext

* reg-gen

* downloaded 2.8.10 form POEditor.com

* Moving SystemConfig Locale dropdown to new Locales.json

* locale names moved to json file

* matching systemconfig locale names

* download 2.8.10 from POEditor

* dataTable loacle files

added datatable filenames to the locales and use them when downloading from site.

* moved datatables lang files to locale dir

* moved po files into PO dir

* removing textdomain locale file into a sub dir

* reading countryCode and langCode from locales.json

* reading and using locale datatable value

* no longer need rename

* moving locale js file from skin dir to local dir

* updated path to datatable locale files

* 1st commit of js files

* added support for full Cal/datPIcker/select 2 locales files

* localejs va grunt task

* Moved concat files to logic via genLocaleJSFiles

* rebuilt via genLocaleJSFiles

also remove timestamp see #2362

* now includes poeditor

* loacle download now runs genLocaleJSFiles

* ignoring so that we don't checkin genned code

* ignoring src/locale/js

* EN-XX fullCalendar Support

support for calendar override for locales

* start 2.8.11 (#2955)

* start 2.8.11

* remove misleading changelog entry

* header cleanup

- $sPageTitleSub is not used - closes #1103
- Breadcrumb is never right... always home etc

* Removed Lic Header

* cleanup

* old unused file

* Apply fixes from StyleCI (#2963)

* cleanup

* header cleanup

* header cleanup

* header cleanup

* header cleanup

* fixed header comment

* using empty for null checks

* removing comments

* Apply fixes from StyleCI (#2966)

* Poeditor locale sync 2.8.11 (#2962)

* added Indonesian

* added Indonesian - Indonesia

* Updated for 2.8.11

* fixed extra char
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants