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

Develop > Master / Clean git history 2.13 #2673

Merged
merged 225 commits into from
Aug 28, 2023
Merged

Develop > Master / Clean git history 2.13 #2673

merged 225 commits into from
Aug 28, 2023

Conversation

camillemonchicourt
Copy link
Member

J'avais fait un rebase de Develop vers Master au lieu d'un merge, ce qui a posé des soucis dans l'historique.

joelclems and others added 30 commits April 26, 2023 18:16
@joelclems
fix checkbox ref #2518
699e8e5
@joelclems
fix use of integer values in checkbox ref #2518
3e5ae99
@bouttier
fix alembic: support broken versions of importlib
29494a9 
Some version of importlib, including those distributed among Python 3.10
and 3.11, returns entry points twice due to the transition from
.egg-info to .dist-info
@TheoLechemia
bump usershub auth module
d0e0ca1
@TheoLechemia
fix entrypoints returned twice
4437d98
@TheoLechemia
Fix set has no attribute extend
d1090c0
@bouttier
feat(backend): periodic task to remove media
039d3a2 
Also add a config parameter to change the CRON value
@bouttier
test: adapt fixture & add test for the task
4087ab9
@bouttier
feat(backend): remove sync_media anywhere else
04a84cb
@bouttier
chore: named crontab parameter
684481e
@bouttier
config(backend): add in config example
8410170
@bouttier
celery: import tasks from gn_commons
c1ffaf2
@TheoLechemia
Fixed navbar and sidenav (#2556)
0ce87ba 
* Fixed navbar and sidenav
add toggle btn to hidde sidenav

* style
@bouttier
feat: add id_source filter for synthese/validation
5772c1a 
Use datalist widget to do that
@bouttier
test: add test on filter id_source
87cc368
@joelclems @bouttier
process non array id_ filters
9ded39d
@joelclems @bouttier
add advanced filter id_synthese
71c65b2
@TheoLechemia @bouttier
synthese models server default values
755fe35
@joelclems
split script install db (#2545)
a264b4a
@bouttier
handle APPLICATION_ROOT with DispatcherMiddleware
6aab09c 
This make APPLICATION_ROOT works with dev mode.
@TheoLechemia @bouttier
Dynamic form : fix number default value #2540
db45d83
@TheoLechemia @bouttier
Fix marker moove - fix #2554
f63581e
@mathieu-roudaut-crea @bouttier
feat: make scripts portable across unix systems
e80a455
@mathieu-roudaut-crea @bouttier
fix(install): python script with bash command
7904a63
@bouttier
check releve ownership before accessing counting
7144813
@bouttier
feat(api): add notification for comment on obs
7f0941f
@bouttier
fix: return url to synthese instead of validation
da01b41
@bouttier
feat(api): add user who commented to the notif
47451c5
@bouttier
feat(db): change migration labels & more robust
f539cd8
@bouttier
style: remove useless white space
ce8b9ef
camillemonchicourt and others added 29 commits August 8, 2023 23:55
@camillemonchicourt
Doc permissions - Mention supergrant
e50183f
@TheoLechemia
add submodule permission command for occtax
b7c3ac5
@TheoLechemia
Merge branch 'develop' of github.com:PnX-SI/GeoNature into develop
77445ec
@DonovanMaillard @camillemonchicourt
Update user-manual.rst
262c70f
@DonovanMaillard @camillemonchicourt
Update user-manual.rst
e14dcc5
@DonovanMaillard @camillemonchicourt
Update user-manual.rst
e486117 
improve metadata doc and add pictures
@DonovanMaillard @camillemonchicourt
Update user-manual.rst
c99b162 
fix typo
@camillemonchicourt
User doc - Review metadata doc
cfbf79b
@DonovanMaillard @camillemonchicourt
Update user-manual.rst
eac6b53 
fix links
@andriacap @Pierre-Narcisi
fix(front): OCCTAX disaplaying last geometry point
e7ad82d 
Fix --> Erreur d'affichage lors de l'enchainement de saisie de données pour le
module occtax . Si la géométrie saisie pour le premier  relevé est un polygon/polyline et que le second relevé est un point ce dernier n'est pas affiché au retour sur le composant map pour le relevé suivant.

Closes #2657
[Refs_ticket]: #2657
Reviewed-by: andriacap
@Pierre-Narcisi
fix(metadata): changing fields to ng-select
56514cf
@Pierre-Narcisi
feat(occtax): add config to expand advanced btn
1152514 
On occurence tab when adding a taxon
@camillemonchicourt
Install - Bump GN to 2.13.0
ef501d7
@camillemonchicourt
Changelog 2.13.0
e4c0935
@camillemonchicourt
Review changelog 2.13.0
0dfc239
@camillemonchicourt
Update CHANGELOG.md
978cf91
@camillemonchicourt
Changelog 2.13.0 - Compléments
f6dbb20
@camillemonchicourt
Changelog 2.13.0
1b99a67 
Mention Permissions Admin issue (documentation)
@camillemonchicourt
Changelog 2.13.0 - Missing fix
57e1cec
@camillemonchicourt
Changelog 2.13.0
8169b6d
@camillemonchicourt
Changelog 2.13.0 - Add contributors
53afafe
@camillemonchicourt
Changelog 2.13.0 - Compléments
7bb612d
@camillemonchicourt
Changelog 2.13.0
5047f0d
@camillemonchicourt
Changelog - Fix layout
1bea0b5
@camillemonchicourt
Cgangelog - Fix layout
3509443
@camillemonchicourt
Changelog - Layout again...
0208cf4
@Pierre-Narcisi
fix(config): ADVANCED_DETAILS_OCCURRENCE_EXPANDED -> EXPANDED_TAXON_A…
e9b086b 
…DVANCED_DETAILS
@camillemonchicourt
Bump VERSION - 2.13.0
34223aa
@camillemonchicourt
Changelog 2.13.0 - Compléments
4112da7
@camillemonchicourt camillemonchicourt merged commit 8ce2702 into master Aug 28, 2023
13 of 14 checks passed
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.