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

Adding optional discard defaults by variable merge_extra_fields #347

Closed
wants to merge 249 commits into from
Closed

Adding optional discard defaults by variable merge_extra_fields #347

wants to merge 249 commits into from

Conversation

haricot
Copy link
Contributor

@haricot haricot commented Oct 9, 2019 •
edited
Loading

related #346

haricot added 30 commits July 4, 2019 01:22
@haricot
Update buttons.py
bb7f88c
@haricot
add plugins bootstrap navbar
85a64d1
@haricot
add navbarplugin.js
bf4d99b
@haricot
add conditional required image plug
4b2cf0e
@haricot
update settings.py
c837d26
@haricot
add js logic for placeholder
667a8ec
@haricot
add templates bootstrap Navbar
e953cbc
@haricot
add mixins bootstrap
59f0102
@haricot
update bootstrap4/settings.py
080441f
@haricot
update bootstrap4/navbar_brand_image.html
79dc8a8
@haricot
update bootstrap4/navbar.py
9255bc5
@haricot
if button in navbar add css class
79aec8c
@haricot
fix choices in BootstrapUtilities
61195f7
@haricot
Update navbar plugins
6e988d6
@haricot
if simple icon in NavItem add css class
75d4c8e
@haricot
Correct logic if not check_unique_element_id
e66d914
@haricot
modify logic if image and required
c3605a3
@haricot
if link in navItem add css class
2d2c4c2
@haricot
update buttons.py
38c3059
@haricot
add classes if parent match
e5cd29f
@haricot
add classes if specific parent match
32a6a66
@haricot
Update BootstrapNavbarPlugin
13760c8
@haricot
add bootstrap4 mixins: positions
aed9b67
@haricot
update bootstrap4/settings.py
ce6ad20
@haricot
add BootstrapListsPlugin
ce4476c
@haricot
Merge branch 'releases/1.0.x' into navbar
c2a6d7f
@haricot
fixed discard defaults
fbeddec 
related jrief#346
@haricot
adding optional discard defaults by variable
af2e0e5 
MERGE_EXTRA_FIELDS_SET=True
@haricot
use RadioSelect for ExtraFieldsPluginFormMixin
59e58bc
@haricot
unneeded import
134a9c2
haricot and others added 27 commits March 5, 2020 17:23
@haricot
fix syntax
2201177
@haricot
fix import unneeded
db33af4
@haricot
fix revert est_accordion.py
f067d85
@haricot
Merge branch 'cascade_mix' into clipboard_library_groups
5aeae82
@haricot
Merge pull request #38 from haricot/clipboard_library_groups
8d53a21 
Clipboard library groups
@haricot
fix import entangled
8c9bcd3
@haricot
fix test
edf7898
@haricot
fix test requirements entangled
3501ecc
@jrief
fix version string
7d42795
@haricot
fix import
94101d4
@haricot
fix import link/plugin_base.py
fa74669
@haricot
fix import link/formsy
a64e4a7
@haricot
fix import bootstrap4/embeds.py
7867056
@haricot
revert accordion.html
52965a6
@haricot
fix merge
edc4bf6
@haricot
fix merge
72a9134
@haricot
complete mixin property
74be053
@haricot
fix compact form init
89668a5
@haricot
Update dev branch 1.3
e6489df
@haricot
git push origin cascade_mixMerge branch 'jrief-releases/1.3' into cas…
b67c189 
…cade_mix
@haricot
clean code
4731bd8
@haricot
remove feature class ExtraFieldsPluginFormMixin
373f8c6
@haricot
remove 'configuration of the plugin directly in its form'
5def0e8 
needed more logic to work correctly
@haricot
Update conftest.py
649e7cc
@haricot
Update mixins.py
5b7fac9
@haricot
Merge branch 'cascade_mix' into patch-34
17e0724
@haricot
fix syntax tuple
c4bc9d1
@haricot haricot mentioned this pull request Mar 6, 2020
Open
@haricot
Copy link
Contributor Author

haricot commented Mar 6, 2020

Close in flavor #379

@haricot haricot closed this Mar 6, 2020
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.
2 participants
@haricot @jrief