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

[6.0] Add a global master language for Multilingual Associations #25403

Draft
wants to merge 127 commits into
base: 6.0-dev
Choose a base branch
from
Draft

[6.0] Add a global master language for Multilingual Associations #25403

Changes from 1 commit
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
cec6bd5
fill select boxes with default values to avoid empty list
lavipr May 27, 2019
57c3a12
Display always the toolbar and adjust its functions
lavipr May 27, 2019
655f7bb
merge the Association- and the "Not Associated"-column together
lavipr May 27, 2019
9cd69c0
Add fields for setting a masterlanguage
lavipr May 28, 2019
b74930c
save the master item in the associations table
lavipr May 29, 2019
d20257a
Merge remote-tracking branch 'parent/4.0-dev' into addingMasterlanguage
lavipr May 29, 2019
eb72d74
change color of associations and center associations column
lavipr May 30, 2019
cc03c48
add masterlanguage information to the language select box
lavipr May 30, 2019
b669d7b
fix the toolbar button where variables have to be checked if they are…
lavipr May 30, 2019
d834ab6
center and widen the association column also in the associations modal
lavipr May 30, 2019
cd7aeb4
Merge remote-tracking branch 'parent/4.0-dev' into addingMasterlanguage
lavipr May 30, 2019
391e1a0
display the master-child associations in the list views
lavipr May 31, 2019
72f8963
Merge remote-tracking branch 'parent/4.0-dev' into addingMasterlanguage
lavipr May 31, 2019
03818fd
Merge remote-tracking branch 'parent/4.0-dev' into addingMasterlanguage
lavipr May 31, 2019
577c1c6
Merge remote-tracking branch 'parent/4.0-dev' into Feature-Multilingu…
lavipr Jun 2, 2019
6812d99
add masterlanguage as default to language select box
lavipr Jun 3, 2019
1495977
Add modified date of a master item to the associations table
lavipr Jun 8, 2019
7da2da0
display new association state 'outdated' in list views
lavipr Jun 8, 2019
8c61dd6
Add a filter for association states to the Associations View
lavipr Jun 8, 2019
e6d7e3c
Add sql for filter for association states to the Associations View
lavipr Jun 8, 2019
e0ceadd
Fix Bug when changing global master language
lavipr Jun 8, 2019
0eed838
Fix bug where newsfeeds and contacts get the same assoc key
lavipr Jun 8, 2019
211400d
Fix Bug for displaying associations without master language
lavipr Jun 8, 2019
75ccfe9
Adding labels to select for accessibility reasons
lavipr Jun 10, 2019
b9361e6
change fields order and add description to these fields
lavipr Jun 10, 2019
500f10e
Merge remote-tracking branch 'parent/4.0-dev' into Feature-Multilingu…
lavipr Jun 10, 2019
b9d451c
fix filter by association state
lavipr Jun 11, 2019
628c22e
Merge remote-tracking branch 'parent/4.0-dev' into Feature-Multilingu…
lavipr Jun 15, 2019
69b7c05
fix filter with correct context for categories in the associations table
lavipr Jun 16, 2019
7171c11
add modified date when installing multilingual sample data
lavipr Jun 16, 2019
a123b14
use date of history if enabled instead of modified date for master item
lavipr Jun 16, 2019
4ab0293
improve filtering by associations state
lavipr Jun 23, 2019
cb4a7d3
undo master language activation for multilingual sample data
lavipr Jun 23, 2019
666acbd
set default value for the association state filter
lavipr Jun 23, 2019
9b3d1c6
fix filter by association state also for modal
lavipr Jun 23, 2019
dbe7494
remove hardcoded table names
lavipr Jun 25, 2019
28010b8
update outdated child of a master item
lavipr Jun 25, 2019
b74287e
add forgotten file for update outdated child of a master item
lavipr Jun 25, 2019
b34c098
remove unused functions, change function name and change comments
lavipr Jun 25, 2019
561c01e
merge from 4.0-dev
lavipr Jun 25, 2019
9f29efd
merge from 4.0-dev
lavipr Jun 26, 2019
be8fdbf
Merge remote-tracking branch 'parent/4.0-dev' into Feature-Multilingu…
lavipr Jul 1, 2019
591ced4
revert some changes and adjust tooltips in List Views with Associations
lavipr Jul 1, 2019
e22457d
adjust code style and rename variables and function
lavipr Jul 1, 2019
fc95e69
open item as target if it is a child language
lavipr Jul 1, 2019
550db64
don't display other target languages if master language is one of them
lavipr Jul 1, 2019
eaf8ce2
improve code style and new function for masterInfo in ListViews
lavipr Jul 1, 2019
2275c8a
Merge remote-tracking branch 'parent/4.0-dev' into Feature-Multilingu…
lavipr Jul 1, 2019
ca7d5b0
rename table columns for master lang
lavipr Jul 1, 2019
7df0d4a
fix display assoc without other children
lavipr Jul 1, 2019
ef78227
fix compare Master View when there is name instead of title used
lavipr Jul 1, 2019
3a109bb
change links to edit association in other listviews with master
lavipr Jul 1, 2019
7f42c40
fix missed renaming table column for master_id
lavipr Jul 2, 2019
978aac0
Merge remote-tracking branch 'parent/4.0-dev' into Feature-Multilingu…
lavipr Jul 2, 2019
e6cdd7e
fix hound
lavipr Jul 2, 2019
506059f
fix hound again
lavipr Jul 2, 2019
a866a13
fix phpcs
lavipr Jul 2, 2019
0acf809
fix phpcs again
lavipr Jul 2, 2019
047bf74
fix hound
lavipr Jul 2, 2019
55e46d1
Update administrator/components/com_associations/forms/filter_associa…
lavipr Jul 2, 2019
eb2bdbb
Update administrator/components/com_associations/Model/AssociationsMo…
lavipr Jul 2, 2019
285944f
Update administrator/components/com_associations/Model/AssociationsMo…
lavipr Jul 2, 2019
3ac1800
Update administrator/components/com_associations/Helper/MasterAssocia…
lavipr Jul 2, 2019
6e30b12
Update administrator/components/com_associations/Helper/MasterAssocia…
lavipr Jul 2, 2019
ad19dc3
Update administrator/components/com_associations/Helper/AssociationsH…
lavipr Jul 2, 2019
42a39b2
Update administrator/components/com_categories/Model/CategoryModel.php
lavipr Jul 2, 2019
ba57d95
Update administrator/components/com_categories/Service/HTML/Administr…
lavipr Jul 2, 2019
190ab67
Update administrator/components/com_contact/Service/HTML/Administrato…
lavipr Jul 2, 2019
3918c30
Update administrator/components/com_content/Service/HTML/Administrato…
lavipr Jul 2, 2019
ef1eb55
Update administrator/components/com_menus/Service/HTML/Menus.php
lavipr Jul 2, 2019
5052e70
Update administrator/components/com_newsfeeds/Service/HTML/Administra…
lavipr Jul 2, 2019
dc44040
Update administrator/language/en-GB/en-GB.com_associations.ini
lavipr Jul 2, 2019
3215e64
Update installation/src/Model/LanguagesModel.php
lavipr Jul 2, 2019
3c182ae
Update libraries/src/MVC/Model/AdminModel.php
lavipr Jul 2, 2019
88ddb2a
Update plugins/system/languagefilter/languagefilter.xml
lavipr Jul 2, 2019
952d7fb
Update administrator/language/en-GB/en-GB.ini
lavipr Jul 2, 2019
393ed64
Update administrator/language/en-GB/en-GB.ini
lavipr Jul 2, 2019
588ee55
fix alpha ordering in 'use' and removed commented out code line
lavipr Jul 2, 2019
3951117
remove fieldset wrapping table
lavipr Jul 2, 2019
f6ba2ee
Update plugins/sampledata/multilang/multilang.php
lavipr Jul 2, 2019
7104b51
Merge branch '4.0-dev' into Feature_Global-Master-For-Multilingual-As…
infograf768 Jul 2, 2019
f6f3e9d
fix correct typeAlias for categories
lavipr Jul 2, 2019
2733b6a
Merge remote-tracking branch 'origin/Feature_Global-Master-For-Multil…
lavipr Jul 2, 2019
439c6ad
get modified table name from contentType table
lavipr Jul 2, 2019
8f97cc0
Update plugins/system/languagefilter/languagefilter.xml
lavipr Jul 2, 2019
a7c72db
Update plugins/sampledata/multilang/multilang.php
lavipr Jul 2, 2019
da88da9
Update plugins/system/languagefilter/languagefilter.php
lavipr Jul 2, 2019
01f9cd8
fix wrong uppercase filename
lavipr Jul 2, 2019
5c321cb
change type of master_date to date and add update sqls
lavipr Jul 2, 2019
ab0e2bd
Add schema updates to pr 25403
richard67 Jul 2, 2019
77bb4f7
Merge pull request #6 from richard67/Feature_Global-Master-For-Multil…
lavipr Jul 2, 2019
e81e549
Merge branch '4.0-dev' into Feature_Global-Master-For-Multilingual-As…
infograf768 Jul 3, 2019
1f8fb0b
Merge remote-tracking branch 'parent/4.0-dev' into Feature_Global-Mas…
lavipr Jul 8, 2019
6304010
Merge remote-tracking branch 'origin/Feature_Global-Master-For-Multil…
lavipr Jul 8, 2019
de8a1b1
remove disabled for filters
lavipr Jul 8, 2019
04ee4a7
rename outdated into out of date
lavipr Jul 8, 2019
fcb4f22
move Route::_call() to the layout
lavipr Jul 8, 2019
059ad32
fix phpcs
lavipr Jul 8, 2019
822eeba
Merge branch '4.0-dev' into Feature_Global-Master-For-Multilingual-As…
lavipr Jul 21, 2019
5dbad04
Merge remote-tracking branch 'parent/4.0-dev' into Global-Master-For-…
lavipr Jul 22, 2019
8f65a6c
fix phpcs
lavipr Jul 22, 2019
e705cf5
Merge branch '4.0-dev' into Feature_Global-Master-For-Multilingual-As…
infograf768 Jul 23, 2019
3069cd7
Merge branch '4.0-dev' into Feature_Global-Master-For-Multilingual-As…
lavipr Aug 6, 2019
197d0ce
avoid using the term master
lavipr Aug 7, 2019
9f5c7a3
use prepared statements and save parent_date value as date
lavipr Aug 21, 2019
c6e83ed
merge with 4.0-dev and resolve conflicts
lavipr Aug 21, 2019
6e74985
fix phpcs
lavipr Aug 21, 2019
f8866a2
fix bug for correct parent_date when adding child from other association
lavipr Aug 21, 2019
1b14de0
Update administrator/components/com_associations/Model/AssociationsMo…
lavipr Aug 22, 2019
41d85a7
Update administrator/components/com_associations/Model/AssociationsMo…
lavipr Aug 22, 2019
6cd6fcb
Merge remote-tracking branch 'parent/4.0-dev' into Global-Master-For-…
lavipr Aug 22, 2019
b4d0019
use getContentLanguage method to count languages
lavipr Aug 23, 2019
5c9d903
use prepared statement and bind variable to the main query
lavipr Aug 23, 2019
6193b2b
Merge remote-tracking branch 'parent/4.0-dev' into Global-Master-For-…
lavipr Aug 23, 2019
4e7e99f
declare variable before running the loop
lavipr Aug 24, 2019
58d567d
Merge remote-tracking branch 'parent/4.0-dev' into Global-Master-For-…
lavipr Aug 24, 2019
a596d3a
Update plugins/system/languagefilter/languagefilter.php
lavipr Aug 24, 2019
f5b6dcb
Fix PHP notices in languagefilter.php
richard67 Aug 24, 2019
1844027
PHPCS, type-safe comparison
richard67 Aug 24, 2019
a17cef8
Merge pull request #7 from richard67/4.0-dev-pr-25403-fix-php-notices-2
lavipr Aug 24, 2019
ac231c8
Fix PHP Notice "Only variables ... by reference" in languagefilter.php
richard67 Aug 24, 2019
fbf0c44
Merge pull request #8 from richard67/Feature_Global-Master-For-Multil…
lavipr Aug 24, 2019
ffc4e27
fix controller name with correct casing
lavipr Aug 24, 2019
6dcae08
fix model call name with correct casing
lavipr Aug 24, 2019
0023d72
Fix PHP Notice "Only variables ... by reference" in DefaultAssocLangM…
richard67 Aug 24, 2019
062dd08
Add missing semicolon
richard67 Aug 24, 2019
440584d
Merge pull request #9 from richard67/Feature_Global-Master-For-Multil…
lavipr Aug 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'parent/4.0-dev' into addingMasterlanguage
  • Loading branch information
@lavipr
lavipr committed May 31, 2019
commit 03818fdf6c187518a667ff2a2d54311db4185251

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.