Jean-Yves Gaulier
|
5f7ca7c9a6
|
add indexes to table "Tokens"
|
2020-02-10 11:16:41 +01:00 |
|
Jean-Yves Gaulier
|
e4d3da9336
|
rollback : can't create token in sql since the om will cry during update. Can't mix om and sql.
|
2020-02-08 22:29:52 +01:00 |
|
Jean-Yves Gaulier
|
83484e3bd0
|
fix for unit-testing on null user (to dig : why ?...)
|
2020-02-08 09:58:57 +01:00 |
|
Jean-Yves Gaulier
|
419440f5c2
|
fix for failing test
|
2020-02-07 22:33:18 +01:00 |
|
Jean-Yves Gaulier
|
18993043f2
|
fake change to re-run tests
|
2020-02-07 22:14:47 +01:00 |
|
Jean-Yves Gaulier
|
746c9076d4
|
fix malformed sql
|
2020-02-07 22:14:47 +01:00 |
|
Jean-Yves Gaulier
|
e75a483cd5
|
PHRAS-2913_create-tokens-faster_4.1
- create token by sql
- create feedentry tokens in bulk-sql
|
2020-02-07 22:14:47 +01:00 |
|
Nicolas Maillat
|
1de6c2776f
|
Merge branch 'master' into PHRDPL-86_xdebug
|
2020-02-07 18:56:43 +01:00 |
|
gjacobjn
|
b18ef09661
|
Update AccountController.php
|
2020-02-07 17:17:54 +01:00 |
|
Nicolas Maillat
|
7a2a6c7f50
|
Merge pull request #3329 from alchemy-fr/PHRAS-2216_Dev_prod_help_About_Refacto
PHRAS-2216 #comment merge Dev-of-Help-About-Design-Refacto
|
2020-02-07 15:20:57 +01:00 |
|
Harrys Ravalomanana
|
54eb516a38
|
PHRAS-2216 Fix on report, admin and account window
|
2020-02-07 17:55:14 +04:00 |
|
Nicolas Maillat
|
dd60f7794e
|
Merge branch 'master' into PHRAS-2812-hide-cterms-ckbox
|
2020-02-07 13:01:49 +01:00 |
|
Nicolas Maillat
|
385977c1b8
|
Merge branch 'master' into PHRAS-2216_Dev_prod_help_About_Refacto
|
2020-02-07 12:57:14 +01:00 |
|
Nicolas Maillat
|
2582e437a9
|
Merge pull request #3332 from alchemy-fr/PHRAS-2909-Detailled-view-fix-audio-player
PHRAS-2909 #comment merge Phraseanet side Detailled views: Fix audio player
|
2020-02-07 12:56:30 +01:00 |
|
Harrys Ravalomanana
|
fb269312d5
|
PHRAS-2909 #comment Fix of audio player on detailled view #time 2h
|
2020-02-07 15:25:05 +04:00 |
|
aynsix
|
a20962e9ba
|
hide chkbox
|
2020-02-07 12:35:57 +03:00 |
|
Nicolas Maillat
|
22d5b6e5b5
|
Merge branch 'master' into PHRAS-2216_Dev_prod_help_About_Refacto
|
2020-02-06 16:54:55 +01:00 |
|
Nicolas Maillat
|
3e8b443633
|
Translated using Weblate (English)
Currently translated at 99.7% (2422 of 2427 strings)
PHRAS-2898
|
2020-02-06 15:53:11 +00:00 |
|
Nicolas Maillat
|
ea1c35a78b
|
Translated using Weblate (French)
Currently translated at 99.7% (2420 of 2427 strings)
|
2020-02-06 15:53:11 +00:00 |
|
Nicolas Maillat
|
28838625e7
|
Translated using Weblate (English)
Currently translated at 99.7% (2420 of 2427 strings)
|
2020-02-06 15:53:11 +00:00 |
|
Nicolas Maillat
|
c4acd98e04
|
Merge pull request #3328 from alchemy-fr/PHRAS-2897-data-format-geolocation
PHRAS-2897 #comment 4.1 Mig patch for 3.8 and 4.0 to 4.1 change data format in geolocation technical fields
|
2020-02-06 16:17:52 +01:00 |
|
Harrys Ravalomanana
|
8f3b06f37f
|
PHRAS-2216 #comment Refacto Help -About #time 3h
|
2020-02-06 19:08:17 +04:00 |
|
aynsix
|
6c1f3c3e62
|
use phraseanet version 4.1.0-alpha.20a
|
2020-02-06 18:01:05 +03:00 |
|
Nicolas Maillat
|
34cbf3d3ca
|
Merge branch 'master' into PHRAS-2812-hide-cterms-ckbox
|
2020-02-06 15:48:06 +01:00 |
|
aynsix
|
2ffed8c4d5
|
patch to change data format geolocation
|
2020-02-06 17:34:57 +03:00 |
|
gjacobjn
|
3c1c6c41f5
|
Fix in template
|
2020-02-06 14:17:51 +01:00 |
|
Nicolas Maillat
|
b2ea160edb
|
Merge pull request #3325 from alchemy-fr/PHRAS-2905-migration-patch-thesaurus-cterme
PHRAS-2905 #comment 4.1 Migration patch for "candidat terme", set zero when thesaurus branch is not define
|
2020-02-06 11:22:59 +01:00 |
|
gjacobjn
|
2f02cef4b0
|
Update Edit.php
|
2020-02-06 10:48:16 +01:00 |
|
aynsix
|
fc53e158da
|
fix visible ckbox in the right side
|
2020-02-05 18:06:04 +03:00 |
|
aynsix
|
8e8c9fca1d
|
fix patch for canditate terme
|
2020-02-05 17:31:53 +03:00 |
|
Nicolas Maillat
|
df53b629c2
|
Merge branch 'master' into PHRAS-2812-hide-cterms-ckbox
|
2020-02-05 13:54:37 +01:00 |
|
Nicolas Maillat
|
31a61f7e6d
|
Merge pull request #3323 from alchemy-fr/PHRAS-2884-chapter-vtt-semantic-clean
PHRAS-2884 #comment merge, bump embed-bundle version in 4.1 use now 2.0.9 for cleaning chapter vtt source name
|
2020-02-05 13:33:35 +01:00 |
|
aynsix
|
e20bb42f98
|
hide cterms ckbox if not relevant
|
2020-02-05 11:21:45 +03:00 |
|
aynsix
|
5be57280f6
|
use embed-bundle 2.0.9 for cleaning chapter vtt source name
|
2020-02-05 10:52:09 +03:00 |
|
Nicolas Maillat
|
98cbc0725b
|
Merge pull request #3320 from alchemy-fr/PHRAS-2898-missing-string
PHRAS-2898 #comment merge 4.1 Some string are missing or not take in account in Feedback printed report
|
2020-02-04 11:46:30 +01:00 |
|
aynsix
|
1996e1efec
|
fix missing string
|
2020-02-04 11:10:27 +03:00 |
|
Nicolas Maillat
|
43eff6d08a
|
Merge pull request #3312 from alchemy-fr/PHRAS-2891_Fix-facets_tooltip
PHRAS-2891 #comment Fix Facet tooltip Phraseanet side with theme refacto
|
2020-01-31 19:47:35 +01:00 |
|
Nicolas Maillat
|
83a049314a
|
Merge branch 'master' into PHRAS-2891_Fix-facets_tooltip
|
2020-01-31 16:11:57 +01:00 |
|
Nicolas Maillat
|
4dcae17a77
|
Merge pull request #3316 from alchemy-fr/PHRAS-2894_Quarantine_allow_to_substitute_without_selecting_target-Record
PHRAS-2894 #comment merge Quarantine: allow to substitute without selecting target record, (when match only one record).
|
2020-01-31 16:09:37 +01:00 |
|
Harrys Ravalomanana
|
a207bdd015
|
PHRAS-2891
|
2020-01-31 18:05:09 +04:00 |
|
Nicolas Maillat
|
92ba8d2c8a
|
Merge branch 'master' into PHRAS-2894_Quarantine_allow_to_substitute_without_selecting_target-Record
|
2020-01-31 13:00:19 +01:00 |
|
Nicolas Maillat
|
855976a4f6
|
Merge pull request #3313 from alchemy-fr/PHRAS_2895_Prod_edit-Windows_missing_space
PHRAS-2895 #comment Prod - Edit windows - missing space between thumbnails
|
2020-01-31 13:00:03 +01:00 |
|
Nicolas Maillat
|
17517a4e1f
|
Merge branch 'master' into PHRAS-2894_Quarantine_allow_to_substitute_without_selecting_target-Record
|
2020-01-31 12:41:55 +01:00 |
|
Nicolas Maillat
|
50caaa2442
|
Merge branch 'master' into PHRAS_2895_Prod_edit-Windows_missing_space
|
2020-01-31 12:41:37 +01:00 |
|
Nicolas Maillat
|
1c4d4c3982
|
Translated using Weblate (French)
Currently translated at 99.7% (2416 of 2423 strings)
|
2020-01-31 10:50:47 +00:00 |
|
Nicolas Maillat
|
6bc497945a
|
Translated using Weblate (English)
Currently translated at 99.8% (2419 of 2423 strings)
|
2020-01-31 10:50:47 +00:00 |
|
Harrys Ravalomanana
|
a4a5fac254
|
PHRAS-2894 #comment Fix Quarantine allow to substitute without selecting target Record #time 2h"
git commit -m PHRAS-2894
|
2020-01-31 14:15:56 +04:00 |
|
jygaulier
|
bd721bec02
|
Merge branch 'master' into PHRDPL-86_xdebug
|
2020-01-30 12:01:00 +01:00 |
|
Alexandre BRACH
|
e55dbd4f89
|
PHRDPL-86 #comment XDebug ok
|
2020-01-30 11:49:11 +01:00 |
|
Harrys Ravalomanana
|
9db40cfed4
|
PHRAS-2895 #comment Fix Prod edit windows : missing space #time 1h
|
2020-01-30 10:57:33 +04:00 |
|