hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,792 Commits 268 Branches 107 Tags
672ff121468c5ca31c25a7b13b9cf716a3a1a08b
Commit Graph

144 Commits

Author SHA1 Message Date
Harrys Ravalomanana
7b9cf8e72d PHRAS-2875 remove sort on twig 2020-01-22 18:28:44 +04:00
Harrys Ravalomanana
e06c4d8eca PHRAS-2875 add Collection on caption tooltip 2020-01-22 16:04:36 +04:00
Harrys Ravalomanana
bcc05fc543 PHRAS-2875 Port of PHRAS-2864 2020-01-21 18:10:28 +04:00
Harrys Ravalomanana
f0063ff257 PHRAS-2875 2020-01-21 12:39:25 +04:00
Harrys Ravalomanana
04c3830c2a PHRAS-2875 Workzone refacto #time 8h 2020-01-20 18:56:42 +04:00
Harrys Ravalomanana
0ea9508ce0 PHRAS-2875 upgrade of Phraseanet-production-client 2020-01-16 18:51:25 +04:00
Harrys Ravalomanana
c43e48a8a6 PHRAS-2861 #comment fix Basket preference #time 3h 2020-01-15 15:24:16 +04:00
Harrys Ravalomanana
18568a6cd6 PHRAS-2861 2019-12-26 15:03:03 +04:00
Harrys Ravalomanana
be20062b6d PRHAS-2861 #comment Port 41 Prod Basket show caption #time 4h 2019-12-26 15:01:02 +04:00
Jean-Yves Gaulier
0967f3c810 PHRAS-2631_feedback-icon 
fix : 2 new icons for feedback baskets; no more display of 2 icons.
fix : tooltip on "about" icon of feedback baskets
 2019-12-05 14:52:46 +01: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
a1ce905c73 PHRAS-2282 #comment Add fix #time 3h 2019-09-12 17:31:01 +04:00
Nicolas Maillat
3c6f12c5d9 Merge branch 'master' into PHRAS-2282_design_of_new_Browser_basket_windows 2019-09-10 12:37:39 +02:00
aynsix
80dcf98e1f fix basket browser windows nok 2019-08-19 15:24:04 +04:00
Harrys Ravalomanana
816225036f PHRAS-2282 add loader on results display 2019-08-14 16:26:16 +04:00
Harrys Ravalomanana
0d84aa040a PHRAS-2282 #comment fix next page or previous page display for results #time 3h 2019-08-14 16:18:15 +04:00
Harrys Ravalomanana
074e1cf9ea PHRAS-2282 commit to run circle ci test 2019-08-13 11:35:06 +04:00
Harrys Ravalomanana
772b102632 PHRAS-2282 #time 4h 2019-08-12 16:40:58 +04:00
Harrys Ravalomanana
e7ec57346a PRHAS-2282 #comment fix JY comments 2019-08-08 13:56:44 +04:00
Harrys Ravalomanana
366c486733 PHRAS-2282 #comment add new design #time 24h 2019-08-07 16:43:53 +04:00
Harrys Ravalomanana
63a89521b6 PHRAS-2544 #comment update fix on grey and white theme #time 8h 2019-07-01 17:41:01 +04:00
Harrys Ravalomanana
76509781eb PHRAS-2386 #adding fix of feedback block #time 2h 2019-06-12 11:06:19 +04:00
Harrys Ravalomanana
ee221c7296 PHRAS-2386 #comment Port41 of PHRAS-2344 #time 2h 2019-06-04 15:47:34 +04:00
Harrys Ravalomanana
82c19b9e2f PHRAS-2386 #comment Refacto picto comment #time 1h 2019-06-04 14:53:15 +04:00
aina-esokia
019498b5c4 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2276-port-template-escape 2019-03-29 17:09:37 +04:00
Filip Vilic
f249d530b3 PHRAS-2385_port_local_manu_refacto 2019-01-14 15:21:12 +01:00
aina-esokia
c58ed45333 fix prod escaping 2018-11-22 14:32:42 +04:00
Mike Ng
684070a3ef rename placeholders for delete buttons 2018-06-13 16:51:04 +04:00
Mike Ng
def58e35ac add action to delete element from basket 2018-06-13 13:53:34 +04:00
Mike Ng
dff837fede refactor basket and story dropdown menu 2018-06-12 15:46:02 +04:00
Mike Ng
802c52d7ff refatored html code to use proper font-awesome classes 2018-01-19 13:32:20 +04:00
Mike Ng
30f49bdd35 resolve conflict 2018-01-08 15:57:13 +04:00
Mike Ng
e838b6f166 Port PHRAS-1577 to 4.1 2017-11-23 16:40:20 +04:00
Thibaud Fabre
97f2e66698 Merge 4.0 branch 2016-12-05 17:04:54 +01:00
Thibaud Fabre
b5bbb1851f Merge branch 4.0 2016-12-05 15:26:48 +01:00
Jean-Yves Gaulier
45eea29710 PHRAS-508_acl-cache 
- fix unit tests
 2016-10-26 19:14:11 +02:00
Jean-Yves Gaulier
642da0fca5 PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
6a2285f66d PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Florian BLOUET
755aac9e3e PHRAS-1038 - fix story navigation in workzone context 2016-03-22 17:17:01 +01:00
Benoît Burnichon
00d0ea66bb Change getIsRead to isRead 2015-12-22 14:25:13 +01:00
Florian BLOUET
205aae28de PHRAS-450 - fix captured images dimension issue 
Admin - allow input value change for sliders
fix misc css issues
update jquery checked attr into prop
 2015-12-03 15:24:29 +01:00
Florian BLOUET
4e7131f296 fix tools actions with event delegation in basket workzone 
fix bridge action href in basket workzone
PHRAS-615 - fix tools actions positionning in basket workzone
 2015-12-02 17:35:41 +01:00
Florian BLOUET
49d4e7b4a6 wip: stylesheets cleanup 2015-12-02 17:35:38 +01:00
Florian BLOUET
0e97e4a0ae moved skins/icon to assets/common/images/icons 2015-12-02 17:35:37 +01:00
Florian BLOUET
f186091823 wip: component reorg, gathering js, css, images, ... 2015-12-02 17:35:36 +01:00
Benoît Burnichon
eefd1432ed Fix some translation errors 2015-10-29 22:53:17 +01:00
Benoît Burnichon
f64e3afa63 Use voters in workzone, actionbar and basket_actionbar 2015-10-28 14:43:24 +01:00
Florian BLOUET
831436f6fe updated existing plugin interfaces, added basket actionbar plugin interface 2015-10-28 12:49:02 +01:00
Florian BLOUET
41d9c18c04 update workzone for handling multiple plugins 2015-10-28 12:46:25 +01:00