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

445 Commits

Author SHA1 Message Date
Romain Neutron
5058465989 Merge pull request #219 from jygaulier/fix904 
fix bug ie8 ticket #904
 2012-09-27 01:39:47 -07:00
jygaulier
a909484ba3 fix bug ie8 ticket #904 2012-09-25 15:54:22 +02:00
Romain Neutron
a80073395d Merge with 3.7 2012-09-14 16:18:22 +02:00
Romain Neutron
afc3806a2d Fix #893 && #894 2012-09-14 14:35:02 +02:00
Romain Neutron
05055c7272 Add empty lazaret route 2012-09-14 14:16:24 +02:00
Romain Neutron
16c49b3382 Merge pull request #187 from nlegoff/order 
Refactor orders
 2012-09-07 09:43:26 -07:00
Romain Neutron
c67652b167 Merge 3.7 2012-09-07 18:22:52 +02:00
Romain Neutron
ff449104bd Fix typo 2012-09-07 18:15:25 +02:00
Nicolas Le Goff
74ce2341a2 delete set_ordermanager & set_exportorder classes 2012-09-07 12:06:06 +02:00
Nicolas Le Goff
623469063f refactor /prod/order/ 
add tests

fix tests

use url_generator & remove debug variable

remove jquery.order.js from  minify

use proper way to pass parameters when building URL with url_generator
 2012-09-07 12:06:05 +02:00
Nicolas Le Goff
0494590523 add order controller 
add order controller
 2012-09-07 12:06:04 +02:00
Romain Neutron
b162057f37 Merge 3.7 2012-09-06 14:30:55 +02:00
Romain Neutron
78c4cda35e use Browser.supportFileAPI instead of IE check 2012-09-06 14:28:42 +02:00
Nicolas Le Goff
f62be63282 add translation string & add IE7+ css compatibility 2012-09-06 13:43:58 +02:00
Nicolas Le Goff
216eca67e9 enhance uploader informations 2012-09-06 11:11:55 +02:00
Nicolas Le Goff
14b3fa9404 fix alert issue in uploader 2012-09-04 13:55:14 +02:00
Romain Neutron
2dde167b66 Merge branch '3.7' 2012-09-03 21:51:36 +02:00
Nicolas Le Goff
6e5d0230cd fix alert bug & resize item box 2012-09-03 19:56:42 +02:00
Nicolas Le Goff
3fc282e612 file are now uploading following user order 
fix typo
 2012-09-03 16:54:40 +02:00
Nicolas Le Goff
8cc746ff6e file are now uploading following user order 2012-09-03 14:53:01 +02:00
Romain Neutron
f27d50be81 Merge with 3.7 2012-08-31 20:30:27 +02:00
Nicolas Le Goff
f8299a8ce2 Fix #862 Upload multiple IE 2012-08-31 16:57:43 +02:00
Nicolas Le Goff
c80d4c96cf fix #852 remove candidat links when user has no access to thesaurus module 2012-08-21 12:40:54 +02:00
Nicolas Le Goff
7e804f2ff0 fix #852 remove candidat links when user has no access to thesaurus module 2012-08-20 18:45:51 +02:00
Romain Neutron
b4145af8ed Update template 2012-07-26 20:57:11 +02:00
Romain Neutron
3db0f04680 Refactor move collection controllers 2012-07-26 17:22:46 +02:00
Romain Neutron
a7cfb223ed Fix bug 2012-07-26 17:18:11 +02:00
Romain Neutron
c5224de003 Substitute helper by record request in Basket / Feeds / Tools / Tooltips 2012-07-26 15:39:26 +02:00
Romain Neutron
2fe74ca186 Remove unnecessary variable 2012-07-25 12:47:10 +02:00
Romain Neutron
6eacc7d179 Update templates filepaths 2012-07-24 13:12:25 +02:00
Romain Neutron
1d7418fd60 Update templates filepaths 2012-07-24 13:12:24 +02:00
Romain Neutron
4dcb9b8be1 Update templates filepaths 2012-07-24 13:12:24 +02:00
Romain Neutron
63e554519c Update templates 2012-07-24 13:12:23 +02:00
Romain Neutron
ec72bed833 Rename twig templates 2012-07-24 13:12:23 +02:00
Romain Neutron
af9bf423c8 Remove YUI 2012-07-24 13:11:27 +02:00
Romain Neutron
c278878c9e Merge with Dev 2012-07-19 14:12:38 +02:00
Romain Neutron
77e571c973 Fix usrs list table 2012-07-19 13:31:10 +02:00
Romain Neutron
232fbff40b Update templates 2012-07-18 19:15:46 +02:00
Romain Neutron
5a51a0fddd Remove video-js support 2012-07-18 16:07:46 +02:00
Nicolas Le Goff
280e0e2bff fix #827 lightbox bottom action bar css position 
fix typo
 2012-07-17 16:34:40 +02:00
Nicolas Le Goff
da1d9435b6 fix #813 overflow issue in bridge 
fix typo

fix typo

fix_typo
 2012-07-17 16:30:41 +02:00
Romain Neutron
d689dc0639 Merge pull request #161 from romainneutron/Fixes 
Fixes
 2012-07-17 06:22:43 -07:00
Romain Neutron
ca1341b55a Update twig templates 2012-07-17 15:01:12 +02:00
Nicolas Le Goff
315c630764 Display fallback message when no preview available for HTML5 player 2012-07-12 13:01:24 +02:00
Romain Neutron
20c871136a Fix quarantine 2012-07-11 15:16:26 +02:00
Romain Neutron
c0ecd0153c Merge pull request #155 from nlegoff/tickets 
Tickets
 2012-07-10 02:41:56 -07:00
Nicolas Le Goff
37e1fba722 display thumbnail instead of preview 2012-07-03 14:40:43 +02:00
Romain Neutron
314fbca84f Enhance advsearch display 2012-07-03 13:52:05 +02:00
Ysolyne Gresille
f36f1ae950 workzone thesaurus display fixed 2012-06-26 14:05:47 +02:00
Ysolyne Gresille
e338ff06be edit button fixed 2012-06-26 14:04:17 +02:00