hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 06:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,333 Commits 268 Branches 107 Tags
746b51b74742e44e613b687522d54776f06813d4
Commit Graph

85 Commits

Author SHA1 Message Date
Romain Neutron
dff686c87d Merge branch '3.7' 2013-01-09 11:25:14 +01:00
Romain Neutron
a0dda3ebe7 Fix #1059 : Remove tinyMCE as dependency 2013-01-08 19:41:41 +01:00
Nicolas Le Goff
eb66047c72 Change path to new controller 2012-10-26 12:19:08 +02:00
Nicolas Le Goff
1859436cb2 Change path to Controller\Records 2012-10-19 17:32:15 +02:00
Nicolas Le Goff
f047c83c17 Fix PR 2012-10-18 15:45:52 +02:00
Nicolas Le Goff
45c3e564df Fix PR 
Conflicts:

	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	templates/web/prod/Share/record.html.twig
 2012-10-18 15:45:52 +02:00
Nicolas Le Goff
7c922c2ecc Use p4.dialog.box tool instead of jquery modal 
Conflicts:

	www/prod/page0.js
 2012-10-18 15:45:51 +02:00
Nicolas Le Goff
e8258acf15 Remove old dialog box && update path to controllers in ajax call 
update path to controllers
 2012-10-18 15:45:49 +02:00
Nicolas Le Goff
8710e0f3cb Refactor record property (status, type) 
update property route

Fixed status

Conflicts:

	lib/Alchemy/Phrasea/Controller/Prod/Record/Property.php
 2012-10-18 15:45:49 +02:00
Romain Neutron
e8b32d8e03 Merge with 3.7 2012-10-10 11:34:21 +02:00
Romain Neutron
12ea1fc184 Add option to re-accept terms of use at download 2012-10-09 14:19:38 +02:00
Romain Neutron
ba25b8cc7c Merge with 3.7 2012-10-04 12:49:01 +02:00
Nicolas Le Goff
c96c89eee4 Fix #920 Publication thumbnails are not displayed 2012-10-03 12:13:37 +02:00
Romain Neutron
c4c0309de6 Update placeholder 2012-10-01 14:53:00 +02:00
Romain Neutron
3413210b43 Add lazyload POC on answers 2012-10-01 14:39:03 +02:00
Nicolas Le Goff
74ce2341a2 delete set_ordermanager & set_exportorder classes 2012-09-07 12:06:06 +02:00
Nicolas Le Goff
040be049b9 review of order javascript 2012-09-07 12:06:04 +02:00
Romain Neutron
30c4542c81 Fix #774 : proposals display 2012-07-03 13:51:50 +02:00
Romain Neutron
021efdd354 Merge pull request #150 from nlegoff/fix_tickets 
Fix tickets
 2012-06-26 03:32:00 -07:00
Nicolas Le Goff
d3007d1f40 fix #708 z-index for print window in preview mode 2012-06-26 11:43:02 +02:00
Ysolyne Gresille
f3b87dd933 thumbnails view fix 2012-06-21 18:41:02 +02:00
Romain Neutron
c106842c25 Fix callback feeds 2012-06-19 10:16:04 +02:00
Nicolas Le Goff
c8f34f5ebe fix #671 prevent error when press esc while edit window is loading 2012-06-12 11:11:37 +02:00
Nicolas Le Goff
0b1321d13d fix #653 prod type selection 2012-05-25 21:10:13 +02:00
Ysolyne Gresille
76260364aa Updtae bootstrap / skins 2012-05-21 14:27:52 +02:00
Nicolas Le Goff
21c2d15754 fix record deletion from story workzone && enhance deletion "when no elements selected the story or basket itself is deleted" 2012-05-10 14:54:47 +02:00
Romain Neutron
8f29c24a0e Merge with master 2012-04-27 18:54:00 +02:00
Romain Neutron
2c83c77d9a Fix date Search / Selection / Default sort 2012-04-27 18:39:42 +02:00
Romain Neutron
c5859e25eb Merge branch 'Fix' into Dev 2012-04-20 10:58:35 +02:00
Romain Neutron
01af439f3a Fix webkit selection 2012-04-20 10:57:21 +02:00
Nicolas Le Goff
5ac707d708 add tools functionnality 2012-04-05 19:25:16 +02:00
Nicolas Le Goff
2e63634867 fix #546 L'icone des propositions indique des "propositions" suite a un changement de page 2012-03-19 13:31:09 +01:00
Romain Neutron
f7cc2702e2 Add notifications to feed entries 2012-03-09 15:59:04 +01:00
Romain Neutron
8761e04eda Add notifications to feed publications 2012-03-09 15:07:18 +01:00
Romain Neutron
81ae791671 Add default zoning 2012-03-06 18:37:14 +01:00
Romain Neutron
c487a6ad62 Fix resize 2012-03-06 16:13:12 +01:00
Romain Neutron
b1d679382b Enhance WorkZone as escamotable 2012-03-06 16:02:41 +01:00
Romain Neutron
1426b9a6f9 Add feedback availability from basket + User icons 2012-03-05 16:08:49 +01:00
Nicolas Le Goff
12ce90d399 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-02-28 19:43:46 +01:00
Nicolas Le Goff
7b0e8633af fix #459 Fonction d'ajout au panier via la vignette 2012-02-28 19:40:12 +01:00
Romain Neutron
6baf06a6e9 Refresh workzone when delete story 2012-02-28 18:32:10 +01:00
Romain Neutron
69fec3d360 Fix page selection 2012-02-28 16:06:57 +01:00
Romain Neutron
2b9e86cb20 Fix loader 2012-02-28 14:28:06 +01:00
Romain Neutron
906a26d11d Fix Basket/Story sorting 2012-02-23 14:47:56 +01:00
Romain Neutron
4699721ee7 Color selection on IE 2012-02-17 17:12:27 +01:00
Romain Neutron
4c3e8ee779 Re-enabling shortcuts 2012-02-16 18:03:28 +01:00
Romain Neutron
6539382d9d Fix Story Actions 2012-02-16 10:46:31 +01:00
Romain Neutron
959bb629d9 ADv search box lifting 2012-02-15 17:27:53 +01:00
Romain Neutron
a17f5fa950 Moved terms Of Use as a dedicated controller 2012-02-10 12:46:05 +01:00
Romain Neutron
6dea14b12e Fix load of publications at startup 2012-02-09 16:38:28 +01:00