Commit Graph

2632 Commits

Author SHA1 Message Date
Nicolas Le Goff
e513a75d86 delete chgthumb, newimg, rotate, img function, chgdocument files 2012-04-12 17:50:13 +02:00
Nicolas Le Goff
f49f816e48 Merge branch 'Dev' of github.com:alchemy-fr/Phraseanet into tools_refactor 2012-04-12 17:39:27 +02:00
Nicolas Le Goff
e723ccf9f8 fix typo 2012-04-12 17:34:15 +02:00
Nicolas Le Goff
a4c5141dfd add thumb extractor routes ( apply new thumbnail & confirm box) 2012-04-12 17:33:30 +02:00
Nicolas Le Goff
9f8adfe2e9 add data-uri dependency 2012-04-12 17:32:08 +02:00
Nicolas Le Goff
1783e46f8e add thumb extractor css 2012-04-12 17:31:38 +02:00
Nicolas Le Goff
4365f1ef27 add thumb extractor icons 2012-04-12 17:31:15 +02:00
Nicolas Le Goff
de6c492c4f add thumb extractor library 2012-04-12 17:30:46 +02:00
Nicolas Le Goff
d6558b33ba add pixastic and thumbExtractor to prod application 2012-04-12 17:30:33 +02:00
Nicolas Le Goff
09a6a2ee3c add pixastic js library 2012-04-12 17:29:39 +02:00
Nicolas Le Goff
29ab98b9c7 update tool box templates 2012-04-12 17:28:49 +02:00
Romain Neutron
45a4af8f1b Merge branch 'FixServerName' into Dev 2012-04-11 14:58:17 +02:00
Romain Neutron
6d57972c1e Fix order master selection 2012-04-11 14:44:58 +02:00
Romain Neutron
a6ffc4f3ec Fix ServerName load 2012-04-11 14:35:56 +02:00
Nicolas Le Goff
4fba8f1418 fix typo issue 2012-04-10 15:07:15 +02:00
Romain Neutron
c3d66f574d Merge branch 'FixBasketSort' into Dev 2012-04-10 14:09:23 +02:00
Romain Neutron
96080dfd1a Fix reorder box selection 2012-04-10 14:08:01 +02:00
Romain Neutron
e9a54f6b1f Merge branch 'FixCSS' into Dev 2012-04-10 11:17:42 +02:00
Romain Neutron
1e71e04214 Fix Css thesaurus links color in lightbox 2012-04-10 11:17:14 +02:00
Nicolas Le Goff
5ac707d708 add tools functionnality 2012-04-05 19:25:16 +02:00
Nicolas Le Goff
ff97549401 add tools templates 2012-04-05 19:24:05 +02:00
Nicolas Le Goff
bb3451a27f add tools helper 2012-04-05 19:23:39 +02:00
Nicolas Le Goff
b94ec33760 add tools controller 2012-04-05 19:23:25 +02:00
Nicolas Le Goff
3051fb90ad add tools rewrite rule 2012-04-05 19:22:31 +02:00
Nicolas Le Goff
83857e6b1f mount tools controller 2012-04-05 19:22:08 +02:00
Romain Neutron
bda41ccc5d Remove display errors 2012-04-05 10:01:15 +02:00
Romain Neutron
a3415de088 Merge branch 'Dev' of github.com:alchemy-fr/Phraseanet into Dev 2012-04-04 21:53:50 +02:00
Romain Neutron
1cce9c072c Redis cache is now doctrine 2 compatible 2012-04-04 21:53:26 +02:00
Romain Neutron
ac1209f07b Add include path for zend gdata 2012-04-04 20:53:31 +02:00
Jonathan SCHNEIDER
f70f068946 Update CI 2012-04-04 21:23:52 +03:00
Romain Neutron
a2aa3b6840 Fix Paginator use 2012-04-04 20:06:50 +02:00
Romain Neutron
a905fa499a Refactor service interface implementation declaration 2012-04-04 16:09:39 +02:00
Romain Neutron
54f5aac73e Remove useless require 2012-04-04 15:53:25 +02:00
Romain Neutron
23ba44e999 Merge branch 'Fix' into Dev 2012-04-04 15:03:13 +02:00
Romain Neutron
545ea1f75a Renew Phrasea Session after collection creation 2012-04-04 15:01:43 +02:00
Romain Neutron
1719adadc5 Fix model application 2012-04-04 14:15:18 +02:00
Romain Neutron
0c33e2819c Disable watermark for creation creator 2012-04-04 13:46:41 +02:00
Romain Neutron
2917ad93ff Fix Typo 2012-04-04 10:50:32 +02:00
Romain Neutron
cbb8670e6f Fix Typo 2012-04-04 10:44:05 +02:00
Romain Neutron
f2c63cdd75 Add Imagine to composer dependencies 2012-04-04 10:41:48 +02:00
Jonathan SCHNEIDER
84b16c272e Fix CI 2012-04-03 19:23:44 +03:00
Jonathan SCHNEIDER
18c395d6e7 Update CI 2012-04-03 16:17:19 +03:00
Jonathan SCHNEIDER
add8222f49 Update CI 2012-04-03 16:16:46 +03:00
Romain Neutron
9fbeefa312 Fix unit tests 2012-03-30 20:45:03 +02:00
Romain Neutron
81e5d4c230 Switch PHPMailer, MoovRelocator, Zend Gdata, TCPDF, Oauth2, PhlickR, PHPShortener from git submodules to Composer 2012-03-30 20:13:40 +02:00
Romain Neutron
fae25dd668 Switch PHPMailer, MoovRelocator, Zend Gdata, TCPDF, Oauth2, PhlickR, PHPShortener from git submodules to Composer 2012-03-30 20:13:40 +02:00
Romain Neutron
9e640c27cf Switch PHPMailer, MoovRelocator, Zend Gdata, TCPDF, Oauth2, PhlickR, PHPShortener from git submodules to Composer 2012-03-30 20:13:40 +02:00
Nicolas Le Goff
f835ea84e8 Merge branch 'Fix36' into Dev 2012-03-30 15:19:25 +02:00
Romain Neutron
01c84dd020 Merge branch 'Fix36' into Dev 2012-03-30 15:17:19 +02:00
Romain Neutron
36bf05dd4b Merge branch 'master' of github.com:alchemy-fr/Phraseanet 2012-03-30 15:17:11 +02:00