Nicolas Maillat
7865c14bcc
Merge branch 'master' into PHRAS-2721_Edit_form_fix_submit_form
2019-09-20 10:19:14 +02:00
Nicolas Maillat
456b65e481
Merge pull request #3167 from HRavalomanana/PHRAS-2661_help_menu
...
PHRAS-2661 #comment Help menue : click on arrow doesn't open sub menue
2019-09-20 10:16:21 +02:00
Nicolas Maillat
db453645fa
Merge branch 'master' into PHRAS-2661_help_menu
2019-09-20 09:53:01 +02:00
Harrys Ravalomanana
c16dc45208
PHRAS-2686
2019-09-20 11:10:26 +04:00
Harrys Ravalomanana
c0350649a1
Merge branch 'master' into PHRAS-2686_paging_new_design
2019-09-20 10:03:32 +04:00
Nicolas Maillat
6c17e6bf87
Merge pull request #3165 from HRavalomanana/PHRAS-2282_upgrade_phraseanet-production-client
...
PHRAS-2282 #comment merge Design of new basket windows Browser with last fix
2019-09-19 12:42:28 +02:00
Harrys Ravalomanana
b3af2c26b2
PHRAS-2686
2019-09-18 17:43:42 +04:00
Harrys Ravalomanana
44199925cd
PHRAS-2721 #comment fix Edit form: multi-values submit #time 3h
2019-09-18 10:39:43 +04:00
Harrys Ravalomanana
20e918175c
PHRAS-2661
2019-09-17 16:17:23 +04:00
Harrys Ravalomanana
a66c813835
PHRAS-2282 change icon
2019-09-17 14:15:27 +04:00
Harrys Ravalomanana
be9220969b
PHRAS-2282 #time 4h
2019-09-17 13:34:06 +04:00
Harrys Ravalomanana
de46a85bce
PHRAS-2661 #comment fix menu bar: help menu #time 3h
2019-09-16 17:58:39 +04:00
Harrys Ravalomanana
a1ce905c73
PHRAS-2282 #comment Add fix #time 3h
2019-09-12 17:31:01 +04:00
Nicolas Maillat
eda2c0555a
Merge pull request #3163 from HRavalomanana/PHRAS-2282_upgrade_phraseanet-production-client
...
PHRAS-2282 #comment Merge Phraseanet side upgrade phraseanet-production-client@0.34.63-d
2019-09-10 14:30:58 +02:00
Nicolas Maillat
dda8eb05bb
Merge branch 'master' into PHRAS-2282_upgrade_phraseanet-production-client
2019-09-10 13:34:20 +02:00
Nicolas Maillat
7756636a2a
Merge pull request #3140 from xrousset78800/PHRAS-2127/fix-geoname-on-registration
...
PHRAS-2127 #comment Merge Add https in default geoname server url
2019-09-10 13:32:55 +02:00
Nicolas Maillat
4ce653b228
Merge branch 'master' into PHRAS-2127/fix-geoname-on-registration
2019-09-10 12:53:35 +02:00
Nicolas Maillat
1bcc71d9fb
Merge pull request #3135 from HRavalomanana/PHRAS-2282_design_of_new_Browser_basket_windows
...
PHRAS-2282 #comment Merge Phraseanet side of Design of new basket windows Browser
2019-09-10 12:53:06 +02:00
Nicolas Maillat
3c6f12c5d9
Merge branch 'master' into PHRAS-2282_design_of_new_Browser_basket_windows
2019-09-10 12:37:39 +02:00
Nicolas Maillat
bb19ebb39c
Merge pull request #3138 from HRavalomanana/PHRAS-2706
...
PHRAS-2706 #comment Merge Phraseanet side of Prod - Basket browser windows - Received basket filter basket
2019-09-10 12:36:52 +02:00
Nicolas Maillat
e76c32338b
Merge branch 'master' into PHRAS-2706
2019-09-10 12:22:17 +02:00
Nicolas Maillat
4ee22be6f2
Merge pull request #3146 from aynsix/PHRAS-2705-basket-browser-windows-nok
...
PHRAS-2705 #comment merge in Phraseanet repo fix basket browser windows nok
2019-09-10 12:21:55 +02:00
Harrys Ravalomanana
0212619314
PHRAS-2282 #comment upgrade phraseanet-production-client@0.34.63-d #time 2h
2019-09-10 14:03:51 +04:00
Nicolas Maillat
e41d2377cb
Merge branch 'master' into PHRAS-2705-basket-browser-windows-nok
2019-09-09 14:35:05 +02:00
Nicolas Maillat
5bff5f7653
Merge pull request #3132 from HRavalomanana/PHRAS-2688_Pord_41_Prod_workzone_change_type_of_numbering
...
PHRAS-2688 #comment merge of Port to 4.1 of Prod workzone: Change type of numbering
2019-09-09 14:29:55 +02:00
Nicolas Maillat
f1ccb0f39f
Merge branch 'master' into PHRAS-2706
2019-09-09 14:27:28 +02:00
Nicolas Maillat
b124aaed91
Merge branch 'master' into PHRAS-2688_Pord_41_Prod_workzone_change_type_of_numbering
2019-09-06 16:25:44 +02:00
Nicolas Maillat
880272ae47
Merge branch 'master' into PHRAS-2705-basket-browser-windows-nok
2019-09-06 16:24:47 +02:00
Nicolas Maillat
2c27c5d8cd
Merge pull request #3152 from aynsix/PHRAS-2741-api-leaves-temporary-file-41
...
PHRAS-2714 #comment merge of Port to 4.1 API leaves a copy of the file into the system temporary directory 4.1
2019-09-06 16:23:34 +02:00
Nicolas Maillat
4b14f6eac0
Merge branch 'master' into PHRAS-2741-api-leaves-temporary-file-41
2019-09-06 16:05:07 +02:00
Nicolas Maillat
1f99e671d8
Merge pull request #3161 from aynsix/PHRAS-2727-unit-test-setstatus
...
PHRAS-2727 :#comment merge in 4.1 Create a unit-test to detect bug described in PHRAS-2716
2019-09-06 16:04:49 +02:00
Nicolas Maillat
0f3c2ea0ee
Merge branch 'master' into PHRAS-2727-unit-test-setstatus
2019-09-06 15:51:43 +02:00
Nicolas Maillat
990378d9b0
Merge branch 'master' into PHRAS-2127/fix-geoname-on-registration
2019-09-06 15:03:21 +02:00
Nicolas Maillat
b260bc0688
Merge branch 'master' into PHRAS-2741-api-leaves-temporary-file-41
2019-09-06 15:00:20 +02:00
Nicolas Maillat
c2b5d0cc5f
Merge pull request #3158 from aynsix/PHRAS-2724-port-PHRAS-2723
...
PHRAS-2724 : #comment Merge of PORT To 4.1 - None information (name, last name etc...) is keep from the Push or a FeedBack user creation form
2019-09-06 14:59:39 +02:00
aynsix
418b86c0ba
initialize status structure for test
2019-09-06 16:20:17 +04:00
Nicolas Maillat
5e3a9c7bee
Merge branch 'master' into PHRAS-2724-port-PHRAS-2723
2019-09-06 13:04:03 +02:00
Nicolas Maillat
84f5cc4857
Merge branch 'master' into PHRAS-2666_slow-notifications_4.1
2019-09-06 13:02:44 +02:00
aynsix
432eb7c255
fix unit test setstatus
2019-09-06 12:26:11 +04:00
aynsix
4d4e5368b1
fix
2019-09-06 11:14:20 +04:00
Nicolas Maillat
e820d4c91c
Merge branch 'master' into PHRAS-2727-unit-test-setstatus
2019-09-05 17:07:27 +02:00
Nicolas Maillat
d241ff2fb3
Merge pull request #3156 from jygaulier/PHRAS-2726_setstatus-api_4.1
...
PHRASE-2726 #comment Fusion of Setstatus-api in 4.1, after this merge and this update, the PR # 3161, currently in a failed state, should proceed correctly. This merge order is not the best ways but this is more quicker.
2019-09-05 17:07:03 +02:00
aynsix
16d1446268
fix unit test setstatus
2019-09-05 18:15:07 +04:00
aynsix
fe087a9dc5
fix user creation from push and feedback window
2019-09-04 12:09:53 +04:00
Jean-Yves Gaulier
53272de3f5
PHRAS-2726_setstatus-api_4.1 : port of PHRAS-2716
...
setstatus api did change unspecified bits due to string offset error
2019-09-03 18:07:36 +02:00
Nicolas Maillat
da6ce86210
Merge branch 'master' into PHRAS-2705-basket-browser-windows-nok
2019-09-03 11:10:34 +02:00
Nicolas Maillat
aea8fc8dc7
Merge pull request #3153 from aynsix/PHRAS-2715-embed-bundle-new-version
...
PHRAS-2715 #comment Merge of bump version of Embed-bundle in 4.1, border issue on firefox
2019-09-02 17:57:17 +02:00
Nicolas Maillat
bb8c311b42
Merge branch 'master' into PHRAS-2741-api-leaves-temporary-file-41
2019-09-02 17:42:50 +02:00
Nicolas Maillat
9911a5168e
Merge branch 'master' into PHRAS-2715-embed-bundle-new-version
2019-09-02 17:41:27 +02:00
jygaulier
cb502916e3
Merge pull request #3149 from tomamplius/master
...
Update databox.php
2019-09-02 16:10:42 +02:00
