Nicolas Maillat
fbbd53a5a6
Merge branch 'master' into PHRAS-2910_Fix_order_manager_from_notification_link
2020-02-17 15:45:10 +01:00
Nicolas Maillat
b43cb1d2c9
Merge pull request #3344 from alchemy-fr/PHRAS-2923_Port_41_Collection_sort
...
PHRAS-2923 #comment merge Port 41 :Collection sort by column
2020-02-17 15:41:14 +01:00
Harrys Ravalomanana
18d69d1537
Merge branch 'master' into PHRAS-2910_Fix_order_manager_from_notification_link
2020-02-17 18:37:04 +04:00
Nicolas Maillat
aa3ee54a85
Merge branch 'master' into PHRAS-2923_Port_41_Collection_sort
2020-02-17 15:26:24 +01:00
Nicolas Maillat
e30f8975f8
Merge pull request #3343 from alchemy-fr/PHRAS-2825_Prod_Add_reset_button_to_initialize_search
...
PHRAS 2825 #comment merge Prod : Add a reset button to initialize searches filters
2020-02-17 15:18:37 +01:00
Harrys Ravalomanana
00f3ac715e
Merge branch 'master' into PHRAS-2923_Port_41_Collection_sort
2020-02-17 17:28:09 +04:00
Harrys Ravalomanana
3eb2c76086
Merge branch 'master' into PHRAS-2825_Prod_Add_reset_button_to_initialize_search
2020-02-17 17:26:50 +04:00
Nicolas Maillat
89c12440e4
Merge pull request #3335 from alchemy-fr/PHRAS-2915_Lightbox_desktop_Sort_basket_order
...
PHRAS-2915 #comment Lightbox (desktop version) Change sort order for basket and Feedback in landing page ( most recent in first)
2020-02-17 13:35:02 +01:00
Harrys Ravalomanana
acc611eac5
PHRAS-2923 #comment Port 41 :Collection sort by column #time 2h
2020-02-17 14:52:34 +04:00
Harrys Ravalomanana
c5e7b317ba
PHRAS-2825
2020-02-14 18:02:18 +04:00
Jean-Yves Gaulier
a8c19de4d3
PHRAS-2927_optimize-feedback-process_4.1
...
add route "lightbox/ajax/GET_ELEMENTS/{{basket_id}}/" to get counts of elements validated as "yes", "no" or "nul".
Will allow front to display alert before submitting
2020-02-13 18:22:54 +01:00
Harrys Ravalomanana
54e9264bdb
PHRAS-2915
2020-02-12 17:30:21 +04:00
Harrys Ravalomanana
fa462b368b
PHRAS-2915 #comment add Read more btn #time 5h
2020-02-12 17:26:10 +04:00
Jean-Yves Gaulier
5a794c493a
create feedEntriesTokens in bulk / doctrine. No more sql
2020-02-11 15:17:13 +01:00
Harrys Ravalomanana
b08ae5c2fa
PHRAS-2910 #comment Fix Order manager : action from notification in menu bar #time 4h
2020-02-11 17:21:03 +04:00
Harrys Ravalomanana
546d07a559
PHRAS-2915 #comment Fix sort basket orfer on lightbox desktop # time 1h
2020-02-11 12:13:48 +04:00
Jean-Yves Gaulier
211ba02f59
bump patch to 22a
2020-02-10 11:39:42 +01:00
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
