hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 14:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,611 Commits 268 Branches 107 Tags
202ca1382143224a03fe0a1eea89fb18d7551a93
Commit Graph

679 Commits

Author SHA1 Message Date
Romain Neutron
77b49bbff9 Refactor Edit Route 2012-10-04 15:31:36 +02:00
Romain Neutron
ba25b8cc7c Merge with 3.7 2012-10-04 12:49:01 +02:00
Nicolas Le Goff
04c2acffa3 Fix #915 Strip html tags from caption values when caption is printed out 
update #922

escape js value

fix alignment
 2012-10-03 13:57:48 +02:00
Nicolas Le Goff
c96c89eee4 Fix #920 Publication thumbnails are not displayed 2012-10-03 12:13:37 +02:00
Nicolas Le Goff
b1e773039f Fix #921 Deletion of phraseanet menu links in lightbox module 2012-10-03 11:22:48 +02:00
Nicolas Le Goff
5453ed9563 Fix #922 prompt message display when downloaded documents are too big 2012-10-03 11:22:48 +02:00
Romain Neutron
abe336f055 Merge pull request #227 from romainneutron/ImgLazyLoad 
Img lazy load
 2012-10-02 02:14:08 -07:00
Romain Neutron
8b9d6f6e91 Merge pull request #226 from jygaulier/fix911 
temporary fix for issue #911 : functions disabled in menu...
 2012-10-02 02:13:40 -07:00
Romain Neutron
6c1054420f Use lazyload as fallback 2012-10-01 15:06:10 +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
Romain Neutron
832867a2b2 Fix template name 2012-09-27 15:35:19 +02:00
Romain Neutron
bd51a017e3 Fix #902 : Fix search sort 2012-09-27 14:22:11 +02:00
Romain Neutron
d39150b202 Fix #912 : rotate multiple documents 2012-09-27 14:21:34 +02:00
jygaulier
875816b31d fix bug ie8 ticket #904 2012-09-27 14:19:49 +02:00
Romain Neutron
0cade89f56 Escape JS strings 2012-09-27 14:19:49 +02:00
Romain Neutron
9dd1575dc9 Move Events Manager to service 2012-09-27 14:19:48 +02:00
jygaulier
91b585c996 temporary fix for issue #911 : functions disabled in menu... 2012-09-27 13:58:43 +02:00
Romain Neutron
de22e18309 Fix #902 : Fix search sort 2012-09-27 12:55:33 +02:00
Romain Neutron
e06890b9a8 Fix #912 : rotate multiple documents 2012-09-27 12:54:50 +02:00
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
2cdcac83c9 Merge pull request #214 from ygresil/Admin 
[WIP] Admin fixes
 2012-09-24 15:31:52 -07:00
Romain Neutron
b3d1ce28c8 Merge pull request #209 from ygresil/EmailTemplate 
new email template
 2012-09-24 15:31:05 -07:00
Romain Neutron
11d688c989 Escape JS strings 2012-09-24 19:15:09 +02:00
Romain Neutron
b86c3ed0c0 Move Events Manager to service 2012-09-24 18:36:40 +02:00
Romain Neutron
12bd132288 post merge cleanup 2012-09-19 15:39:59 +02:00
Romain Neutron
70a3244431 post merge cleanup 2012-09-19 15:39:55 +02:00
jygaulier
599e8ad3e1 apply comments of pull request 2012-09-17 15:31:16 +02:00
jygaulier
5f4c09ba72 apply comments of pull request 2012-09-17 15:31:03 +02:00
jygaulier
9a008c631a apply comments of pull request 2012-09-17 15:24:50 +02:00
jygaulier
90841c5ba1 fusion task, tasks, scheduler dans taskmanager 
todo : tests
 2012-09-17 14:16:15 +02:00
jygaulier
6e302e85a4 silexing taskmanager & tasks 2012-09-17 14:16:15 +02:00
jygaulier
883cb1dec6 en cours : silexing taskmanager : add first tests 2012-09-17 13:38:19 +02:00
jygaulier
be24152468 en cours : silexing taskmanager 2012-09-17 13:38:19 +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
0cb823f65e Enhance lightbox error message 2012-09-14 11:58:58 +02:00
Ysolyne Gresille
a3ef37fc4d bugfix js admin demand 2012-09-13 19:19:02 +02:00
Ysolyne Gresille
39d1a0a5b9 Admin demande page updated 2012-09-13 18:50:09 +02:00
Ysolyne Gresille
850293ea86 template fixes for admin 2012-09-13 14:37:25 +02:00
Ysolyne Gresille
58f718f773 new email template 2012-09-12 11:12:14 +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