hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 06:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,257 Commits 268 Branches 107 Tags
e591125e83cbbf09dd6d2dd73a19cb3ee758e40c
Commit Graph

16257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Maillat
a8af8deec2 Translated using Weblate (French) 
Currently translated at 98.0% (2715 of 2770 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/fr/
 2021-09-14 16:40:40 +02:00
Nicolas Maillat
66a1d507fe Merge pull request #3852 from alchemy-fr/PHRAS-3516-advanced-search-sort-result 
PHRAS-3516 merge Prod - Advance search -Sort results by field type string
 2021-09-14 16:24:52 +02:00
jygaulier
ddf075f6c8 PHRAS-3516-advanced-search-sort-result 
sort text fields on ".raw" version (same as phr4.0)
 2021-09-14 10:11:13 +02:00
Nicolas Maillat
c4719c64cb Merge branch 'master' into PHRAS-3516-advanced-search-sort-result 2021-09-13 18:39:41 +02:00
Nicolas Maillat
d03c465dc1 Merge pull request #3861 from alchemy-fr/PHRAS-3524-basket-click-in-notification 
PHRAS-3524 merge Prod - windows Notification - Notification for a "received basket" require a double click
 2021-09-13 18:36:10 +02:00
aynsix
b4ee059c65 PHRAS-3524 fix basket click 2021-09-10 14:40:05 +03:00
Nicolas Maillat
d8907116cc Merge pull request #3858 from alchemy-fr/PHRAS-3522-notification-uninterpreted-html 
PHRAS-3522 merge Prod - Notification - notifications windows contain uninterpreted HTML (URL)
 2021-09-09 18:53:47 +02:00
Nicolas Maillat
0161507358 Merge branch 'master' into PHRAS-3522-notification-uninterpreted-html 2021-09-09 18:36:29 +02:00
Nicolas Maillat
270fcad511 Merge pull request #3859 from alchemy-fr/PHRAS-3523_some-images-not-stamped 
PHRAS-3523 merge some-images-not-stamped
 2021-09-09 18:36:17 +02:00
jygaulier
259fd669a5 PHRAS-3523_some-images-not-stamped 
fix memory leak
 2021-09-09 17:52:57 +02:00
aynsix
edbc63df87 display time on dialog 2021-09-09 17:41:21 +03:00
aynsix
cfc06cdd44 change color link 2021-09-09 17:18:22 +03:00
aynsix
90ef036c05 PHRAS-3522 fix uninterpreted html in notification 2021-09-09 14:23:56 +03:00
Nicolas Maillat
1fa06df13c Merge pull request #3853 from alchemy-fr/PHRAS-3490-admin-suggestedvalue-null 
PHRAS-3490 merge fix null and undefined value
 2021-09-08 18:22:01 +02:00
Nicolas Maillat
c52beaa04b Merge branch 'master' into PHRAS-3490-admin-suggestedvalue-null 2021-09-08 18:06:13 +02:00
Nicolas Maillat
2eb28df167 Merge pull request #3857 from alchemy-fr/PHRAS-3521_export-by-email-not-stamped 
PHRAS-3521 merge export-by-email-not-stamped
 2021-09-08 18:05:59 +02:00
jygaulier
a4c932ab6c Update ExportMailWorker.php 
remove bad "assert"s
 2021-09-08 17:27:40 +02:00
jygaulier
b2262642fd PHRAS-1974_rgpd-remove-unactive-users 
add confirm before delete
add option "list"
add filters to not act on models, api accounts, ...
 2021-09-07 19:17:23 +02:00
Nicolas Maillat
0493d40095 Merge pull request #3855 from alchemy-fr/PHRAS-3519_upload-tmp-then-move 
PHRAS-3519 merge upload tmp then move
 2021-09-07 19:13:50 +02:00
Nicolas Maillat
a133cd79cc Merge branch 'master' into PHRAS-3519_upload-tmp-then-move 2021-09-07 17:09:36 +02:00
Nicolas Maillat
94e71d3e68 Merge pull request #3841 from alchemy-fr/PHRAS-3499_stamper-in-download-worker 
PHRAS-3499 merge stamper in download worker
 2021-09-07 17:09:24 +02:00
Nicolas Maillat
f305528cf8 Merge branch 'master' into PHRAS-3499_stamper-in-download-worker 2021-09-07 16:48:13 +02:00
jygaulier
d225b381e4 PHRAS-3519_upload-tmp-then-move 
implement atomic (?) "tmp+move" method on uploaded file
add traces of document filesize
 2021-09-07 15:51:11 +02:00
jygaulier
4834daa9f5 Merge branch 'master' into PHRAS-1974_rgpd-remove-unactive-users 2021-09-07 12:11:43 +02:00
aynsix
5d96fc1761 fix null and undefined value 2021-09-07 11:30:37 +03:00
aynsix
fe2c97b237 port 4.1 advanced search sort by 2021-09-06 11:51:09 +03:00
Nicolas Maillat
88a6506ded Merge pull request #3851 from alchemy-fr/PHRAS-3515-registration-form-xss 
PHRAS-3515 Cross-site scripting vulnerability found on the registration form caused by Notification refacto
 2021-09-03 14:40:35 +02:00
aynsix
3d1bb65a3d fix term of use link on export 2021-09-03 15:19:54 +03:00
aynsix
0f93e09106 fix text in register form 2021-09-03 11:58:56 +03:00
aynsix
b8921e507d PHRAS-3515 escape value from user 2021-09-02 14:26:56 +03:00
Nicolas Maillat
8f596e939d Merge branch 'master' into PHRAS-3499_stamper-in-download-worker 2021-08-13 11:42:13 +02:00
Nicolas Maillat
91f65e1124 Merge branch 'master' into PHRAS-1974_rgpd-remove-unactive-users 2021-08-13 11:41:58 +02:00
Nicolas Maillat
0d9b930add Merge pull request #3846 from alchemy-fr/PHRAS-3416_Phraseanet_localization_weblate 
PHRAS-3416 Merge phraseanet localization weblate
 2021-08-13 11:41:20 +02:00
Jennifer Piva
ca559ba06f Translated using Weblate (French) 
Currently translated at 98.1% (2716 of 2768 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/fr/
 2021-08-13 11:18:39 +02:00
Jennifer Piva
69426375f6 Translated using Weblate (English) 
Currently translated at 98.0% (2715 of 2768 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/en/
 2021-08-13 11:18:39 +02:00
Jennifer Piva
d681b5faf0 Translated using Weblate (German) 
Currently translated at 97.9% (2711 of 2768 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/de/
 2021-08-13 11:18:38 +02:00
Jennifer Piva
c9a4c1701d Translated using Weblate (English) 
Currently translated at 98.0% (2715 of 2768 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/en/
 2021-08-13 10:44:04 +02:00
Hosted Weblate
44b6bccaeb Merge branch 'origin/master' into Weblate. 2021-08-12 23:49:53 +02:00
Nicolas Maillat
94b2f49a90 Merge pull request #3845 from alchemy-fr/PHRAS-3348-expired-token-clean 
PHRAS-3348 gracefull delay of 30 days before removing expired validation token
 2021-08-12 23:49:49 +02:00
aynsix
77abda4996 PHRAS-3348 fix clean token 2021-08-12 17:19:18 +03:00
jygaulier
6908679981 Merge branch 'master' into PHRAS-1974_rgpd-remove-unactive-users 2021-08-12 16:02:59 +02:00
jygaulier
b29a64bd79 Merge branch 'master' into PHRAS-3499_stamper-in-download-worker 2021-08-12 16:02:36 +02:00
Hosted Weblate
a9e139baea Merge branch 'origin/master' into Weblate. 2021-08-12 15:02:54 +02:00
Nicolas Maillat
fa1b87a103 Merge pull request #3844 from felixalchemy/PHRAS-3506_MoveAPI_documentation_v3_content_to_doc 
PHRAS-3506: merge Move API_documentation/v3 content to /doc
 2021-08-12 15:02:50 +02:00
Nicolas Maillat
fcc07c1d50 Merge branch 'master' into PHRAS-3506_MoveAPI_documentation_v3_content_to_doc 2021-08-12 14:40:45 +02:00
Hosted Weblate
e8d69cceaf Merge branch 'origin/master' into Weblate. 2021-08-12 13:06:10 +02:00
Nicolas Maillat
8af1f1c3a7 Merge pull request #3836 from alchemy-fr/PHRAS-3237-worker-record-mover 
PHRAS-3237  Merge Worker - Port "record mover" task as worker and rename RecordsActions"
 2021-08-12 13:06:05 +02:00
Nicolas Maillat
830695e0d7 Merge branch 'master' into PHRAS-3237-worker-record-mover 2021-08-12 12:27:30 +02:00
Hosted Weblate
a3aa9d0587 Merge branch 'origin/master' into Weblate. 2021-08-12 12:24:52 +02:00
Nicolas Maillat
3445f7759c Merge pull request #3843 from alchemy-fr/PHRAS-3507-parent-null 
PHRAS-3507 merge Prod - Expose - Set null when user select "No parent publication" , show login error information, password form is alway display
 2021-08-12 12:24:47 +02:00