Commits · 6a3af917567be11603eccb40e2dbb48b1a363df3 · fusiondirectory / fusiondirectory

19 Apr, 2021 1 commit

Merge branch '6095-put-the-fusiondirectory-github-funding-yml-for-github' into '1.4-dev' · 6a3af917

bmortier authored 4 years ago

Resolve "put the fusiondirectory/.github/FUNDING.yml for github"

Closes #6095

See merge request fusiondirectory/fd!896

(cherry picked from commit 1673443d)

ab6f438d  feat(github) add sponsoring for github

6a3af917

06 Apr, 2021 2 commits
- Merge branch '6152-add-subscription-screen' into '1.3-fixes' · 68b669ba
  Côme Chilliet authored 4 years ago
```
Resolve "Add subscription screen" in 1.3.1

See merge request fusiondirectory/fd!894
```
  68b669ba
- fix(subscription) Add validation of ini file section and attributes · 56e1fc72
  Côme Chilliet authored 4 years ago
```
issue #6152
```
  Unverified
  
  56e1fc72
01 Apr, 2021 2 commits
- Merge branch '6152-add-subscription-screen' into '1.3-fixes' · 56e25c8e
  Côme Chilliet authored 4 years ago
```
Resolve "Add subscription screen"

See merge request fusiondirectory/fd!892
```
  56e25c8e
- fix(subscription) Do not use non-existing class SimplePluginError · d15df1d2
  Côme Chilliet authored 4 years ago
```
issue #6152
```
  Unverified
  
  d15df1d2
24 Mar, 2021 4 commits
- Merge branch '6152-add-subscription-screen' into '1.3-fixes' · 8467a8e5
  Côme Chilliet authored 4 years ago
```
Resolve "Add subscription screen" in 1.3.1

See merge request fusiondirectory/fd!891
```
  8467a8e5
- fix(subscription) Fix error when importing twice without leaving the page · f095427b
  Côme Chilliet authored 4 years ago
```
issue #6152
```
  Unverified
  
  f095427b
- Merge branch '6152-add-subscription-screen' into '1.3-fixes' · 6c61b365
  Côme Chilliet authored 4 years ago
```
Resolve "Add subscription screen" in 1.3.1

See merge request fusiondirectory/fd!890
```
  6c61b365
- fix(subscription) There is no update function in 1.3-fixes · 44a8f1c0
  Côme Chilliet authored 4 years ago
```
issue #6152
```
  Unverified
  
  44a8f1c0
23 Mar, 2021 10 commits

Merge branch 'cherry-pick-' into '1.3-fixes' · 4f4bcbcd

bmortier authored 4 years ago

Merge branch '6157-fix-reference-to-the-documentation-after-moving-around-fusiondirectory-documentationin-upgrade' into '1.3-fixes'

See merge request fusiondirectory/fd!889

4f4bcbcd

Merge branch... · 5b61a714

bmortier authored 4 years ago

Merge branch '6157-fix-reference-to-the-documentation-after-moving-around-fusiondirectory-documentationin-upgrade' into '1.4-dev'

Resolve "fix reference to the documentation after moving around fusiondirectory documentationin UPGRADE.md and README.md"

Closes #6157

See merge request fusiondirectory/fd!888

(cherry picked from commit 598c9c59)

fd99dc93  fix(docs) fix reference to the documentation after moving around...

5b61a714

Merge branch '6152-add-subscription-screen' into '1.3-fixes' · ed564989
Côme Chilliet authored 4 years ago
```
Resolve "Add subscription screen" in 1.3.1

See merge request fusiondirectory/fd!887
```
ed564989
fix(subscription) Fix plInfo to match 1.3 behavior · afba18fa
Côme Chilliet authored 4 years ago
```
issue #6152
```
Unverified

afba18fa
Merge branch '6152-add-subscription-screen' into '1.3-fixes' · 603c82d7
Côme Chilliet authored 4 years ago
```
Resolve "Add subscription screen" crash in 1.3.1

See merge request fusiondirectory/fd!884
```
603c82d7

Merge branch 'cherry-pick-' into '1.3-fixes' · 300a8fcc

bmortier authored 4 years ago

Merge branch '6095-put-the-fusiondirectory-github-funding-yml-for-github' into '1.3-fixes'

See merge request fusiondirectory/fd!886

300a8fcc

Merge branch '6095-put-the-fusiondirectory-github-funding-yml-for-github' into '1.4-dev' · 284562e4

bmortier authored 4 years ago and

bmortier committed 4 years ago

Resolve "put the fusiondirectory/.github/FUNDING.yml for github"

Closes #6095

See merge request fusiondirectory/fd!776

(cherry picked from commit e6339fb8)

f9ba8ceb  fix(funding) update funding for github

284562e4

Merge branch 'cherry-pick-' into '1.3-fixes' · 39270dcd

bmortier authored 4 years ago

Merge branch '6095-put-the-fusiondirectory-github-funding-yml-for-github' into '1.3-fixes'

See merge request fusiondirectory/fd!885

39270dcd

Merge branch '6095-put-the-fusiondirectory-github-funding-yml-for-github' into '1.4-dev' · c06d6c76

bmortier authored 4 years ago and

bmortier committed 4 years ago

Resolve "put the fusiondirectory/.github/FUNDING.yml for github"

Closes #6095

See merge request fusiondirectory/fd!774

(cherry picked from commit 286ce869)

28aad03f  feat(github-funding) add github funding

c06d6c76

fix(core) Import htmlescape from 1.4-dev · 98baf66a
Côme Chilliet authored 4 years ago
```
Needed by subscriptionInfo

issue #6152
```
Unverified

98baf66a

22 Mar, 2021 2 commits
- Merge branch '6009-updating-the-locales-for-1-3-1' into '1.3-fixes' · c09bad59
  bmortier authored 4 years ago
```
Resolve "updating the locales for 1.3.1"

See merge request fusiondirectory/fd!883
```
  c09bad59
- fix(locales) updating locales for 1.3.1 · bd581ee8
  bmortier authored 4 years ago
```
Signed-off-by: Benoit Mortier <benoit.mortier@fusiondirectory.org>
```
  bd581ee8
18 Mar, 2021 4 commits
- Merge branch '6152-add-subscription-screen' into '1.3-fixes' · a4bc07ad
  Côme Chilliet authored 4 years ago
```
Resolve "Add subscription screen"

See merge request fusiondirectory/fd!882
```
  a4bc07ad
- fix(subscription) Fix mainInc of subscription for 1.3-fixes · 2e5cfa49
  Côme Chilliet authored 4 years ago
```
issue #6152
```
  Unverified
  
  2e5cfa49
- Merge branch '6152-add-subscription-screen' into '1.3-fixes' · efdd13b3
  Côme Chilliet authored 4 years ago
```
Resolve "Add subscription screen"

See merge request fusiondirectory/fd!881
```
  efdd13b3
- fix(subscription) Add missing main.inc file for 1.3-fixes · 43000c65
  Côme Chilliet authored 4 years ago
```
issue #6152
```
  Unverified
  
  43000c65
16 Mar, 2021 14 commits
- Merge branch '6152-add-subscription-screen' into '1.3-fixes' · 83b18449
  Côme Chilliet authored 4 years ago
```
Resolve "Add subscription screen"

See merge request fusiondirectory/fd!880
```
  83b18449
- feat(simpleplugin) Add display format to GeneralizedTimeDisplayAttribute · 740301ee
  Côme Chilliet authored 4 years ago
```
issue #6152
```
  Unverified
  
  740301ee
- feat(simpleplugin) Move GeneralizedTimeDisplayAttribute from audit to core · 916e6681
  Côme Chilliet authored 4 years ago
```
issue #6152
```
  Unverified
  
  916e6681
- fix(subscription) Change code to fix boggus codesniffer check · d4e8fb9f
  Côme Chilliet authored 4 years ago
```
1.3-fixes codesniffer was complaining on these lines

issue #6152
```
  Unverified
  
  d4e8fb9f
- fix(subscription) Remove code not compatible with PHP 5.6 · c0af3c44
  Côme Chilliet authored 4 years ago
```
issue #6152
```
  Unverified
  
  c0af3c44
- feat(subscription) Add text when subscription is expired · 32413a3b
  Côme Chilliet authored 4 years ago
```
issue #6152
```
  Unverified
  
  32413a3b
- fix(subscription) Add link to subscription page, split import in a second section · f8bf4e0f
  Côme Chilliet authored 4 years ago
```
issue #6152
```
  Unverified
  
  f8bf4e0f
- fix(subscription) Hide time for start/end date · 120e8ca3
  Côme Chilliet authored 4 years ago
```
issue #6152
```
  Unverified
  
  120e8ca3
- feat(subscription) Ajout de l’uid au ini, fix du dn · e49d8928
  Côme Chilliet authored 4 years ago
```
issue #6152
```
  Unverified
  
  e49d8928
- feat(core) Add schema and fix ini importation · 741d39a3
  Côme Chilliet authored 4 years ago
```
issue #6152
```
  Unverified
  
  741d39a3
- feat(core) rename subscriptions to subscription · fd5686d0
  Côme Chilliet authored 4 years ago
```
issue #6152
```
  Unverified
  
  fd5686d0
- fix(sentences) reworded some sentences · bfb87039
  bmortier authored 4 years ago
```
Signed-off-by: Benoit Mortier <benoit.mortier@fusiondirectory.org>
```
  Unverified
  
  bfb87039
- fix(simpleplugin) Improve empty Date handling · 9117e72a
  Côme Chilliet authored 4 years ago
```
issue #6152
```
  Unverified
  
  9117e72a
- feat(core) Add subscription page · 95ce0118
  Côme Chilliet authored 4 years ago
```
issue #6152
```
  Unverified
  
  95ce0118
01 Feb, 2021 1 commit
- Merge branch '6122-problems-with-fd-web-setup' into '1.3-fixes' · a4f3ae00
  Côme Chilliet authored 4 years ago
```
Resolve "Problems with FD web setup"

See merge request fusiondirectory/fd!860
```
  a4f3ae00