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

Re-sync with upstream #3

Draft
wants to merge 832 commits into
base: master
Choose a base branch
from
Draft

Re-sync with upstream #3

wants to merge 832 commits into from

Conversation

viccross
Copy link
Owner

Seeing if there's any possibility to be able to bring our source up-to-date with upstream...

@viccross viccross self-assigned this Dec 20, 2021
@viccross
Copy link
Owner Author

viccross commented Dec 20, 2021 •
edited
Loading

The conflicts are from files that I've updated which have been moved/deleted upstream.

pages/change.php
css/self-service-password.css
index.php

There are also merge conflicts in lib/functions.php.

viccross
viccross commented Jan 7, 2022
View reviewed changes
Copy link
Owner Author

@viccross viccross left a comment

Choose a reason for hiding this comment

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

This set looks good

armfem and others added 27 commits February 6, 2024 17:03
@armfem
Error handling when using the signal-cli api for sms
a1bc049
@coudot
Merge pull request #833 from Worteks/issue-809-bad-error-signal
cc99125 
Error handling when using the signal-cli api for sms
@armfem
Adding possibility to deactivate ldapsearch for phone.
8bbb581
@armfem
Adding phone option
a22f58b
@iotaka
Update it.inc.php
d9142c0 
Fixed wrong accent the verb "to be" is with "è" not "é" in Italian.
Changed some sentences.
@coudot
Merge pull request #839 from iotaka/patch-1
fd2afbd 
Update it.inc.php
@coudot
Add bootstrap as composer dependency
db67545
@coudot
Replace panel by card
38a5540
@coudot
Navbar
f6a9427
@coudot
Images
7aec682
@coudot
Alerts
440cc98
@coudot
Forms
ea1a5f6
@coudot
Adapt CSS
8762188
remove bootstrap-theme.min.css, as it seems to be removed in bootstra…
d42bf75 
…p 5.3 (#834)
@coudot
Merge pull request #837 from ltb-project/834-update-bootstrap
4ab4d9a 
Upgrade Bootstrap to 5.3
@campolargo
Fix pt-BR translation for pwned password policy
7ee841a
@coudot
Merge pull request #841 from campolargo/master
cc0e181 
Fix pt-BR translation for pwned password policy
remove useless show_policy function, now rendered by smarty template (#…
20c710c 
…835)
add checkentropy feature (work-in-progress) (#830)
24e9c75
go on checkentropy feature (work-in-progress) (#830)
8a9c05a
fix UI of checkentropy feature (work-in-progress) (#830)
8bc5b05
fix js function call in checkentropy feature (work-in-progress) (#830)
bd74e4e
add backend check in checkentropy feature (work-in-progress) (#830)
ede341e
fix autoload lib loading in functions.inc.php (work-in-progress) (#830)
9eaaaeb
add composer update action in github ci
03494a9
fix functions.php requirement: use __DIR__
853acb4
add entropy unit test (#830)
f7d41e8
David Coutadeur and others added 30 commits September 16, 2024 19:54
@davidcoutadeur
use password policy functions from ltb-common (#968)
fc0991f 
* use check_password_strength and checkEntropyJSON from ltb-common
* externalize ppolicy smarty assignments into a dedicated function
* use html, js and css ppolicy code from ltb-common
@toky0 @coudot
Add ar.png
981fe05
@toky0 @coudot
Update config_general.rst
fcee69a 
Add Arabic language support
@coudot
Merge pull request #989 from ltb-project/arabic-language-support
c437d12 
Arabic language support
@coudot
Improve FR translation (#957)
b6bafc8
@davidcoutadeur
Use page size parameter from ltb-common (#985)
2121d2a
@davidcoutadeur
update ltb-common library to v0.3.0 (#948)
749bada
fix some typos and prepare 1.7.0 release
00c7d7d
@abpai94 @davidcoutadeur
#943: Removed duplicated detect language code.
38056df
@coudot
Update version in index.php
5d8e69f
fix typo
c89946a
@coudot
Replace lib detectbrowserlanguage in REST file (should have been done…
972086f 
… for #943)
@coudot
Set version 1.7.1
471ecc7
@coudot
Set 1.7.1 version in packaging files
eea47ee
@davidcoutadeur
localize friendly captcha (#1006)
683fb4b
small precision about gssapi credentials in doc
f6ea74a 
see also ltb-project/ltb-common#51
@coudot
Update release process to publish alpine docker images
ceb132b
@abpai94
#1005: Fixing sms number truncate bug.
e6aca7a
@coudot
Merge pull request #1026 from Worteks/1005-sms-truncate-bug-fix
c34c9ba 
Fixing sms number truncate bug.
@davidcoutadeur
fix invalid token after captcha fail (#1018)
1d0e993
@davidcoutadeur
fix permission issue on config.inc.php link when container run unpriv…
914968e 
…ileged (#1022)
precision about simple or sasl bind configuration in doc
72b8eb1 
see also ltb-project/ltb-common#61
@davidcoutadeur
fix missing sasl dependency (#1008)
c5d240d
@davidcoutadeur
add missing library libsasl2-modules-gssapi-mit (#1008)
718419a
@davidcoutadeur
update ltb-common to 0.5.0 (#1032)
08df2dd
@ludovi-com @davidcoutadeur
Fix input-group on sendtoken (mail) page
50642e6 
Moved the hidden token input outside the Bootstrap input-group to ensure the correct display of the border-radius at the end of the text input
@coudot
Update version in index and packaging files
2b58d02
@click0
Ukrainian translation corrected
b26fa2f 
Signed-off-by: vlad11 <admin@support.od.ua>
@coudot
Merge pull request #1037 from click0/Ukrainian-translation-1.7.2
f37bd74 
Ukrainian translation corrected
@davidcoutadeur
fix missing token after form fail (#1038)
00648c4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@viccross viccross

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.