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

1671 Commits

Author SHA1 Message Date
Romain Neutron
098b57389c Merge with master 2012-04-19 11:17:28 +02:00
Romain Neutron
18707146b7 Subdef export does not include original file extension anymore 2012-04-19 11:05:33 +02:00
Romain Neutron
82c4474f55 Fix databox cache update 2012-04-19 10:41:34 +02:00
Romain Neutron
f779bddc99 Merge with master 2012-04-18 14:00:27 +02:00
Romain Neutron
4b7f6175e7 Fix bug meta merging 2012-04-18 13:39:50 +02:00
Romain Neutron
322df354b4 Merge with master 2012-04-18 12:42:38 +02:00
Romain Neutron
80e777658e Fix labels with thesaurus links 2012-04-18 12:24:13 +02:00
Romain Neutron
f2a649ba4b Bump to version 3.6.2 2012-04-18 11:54:18 +02:00
Romain Neutron
c1e6c19959 Merge branch 'Fix' into Dev 2012-04-18 11:53:19 +02:00
Romain Neutron
ce98f73f8f Fix #584 : some selection are returned as object instead of array 2012-04-18 11:45:46 +02:00
Romain Neutron
8025622378 Move tests at root 2012-04-14 11:57:28 +02:00
Romain Neutron
c427ee5960 Fix unit tests 2012-04-14 02:28:51 +02:00
Romain Neutron
450c789cef Fix annotations 2012-04-13 19:12:26 +02:00
Romain Neutron
8b03568108 Fix installer 2012-04-13 17:45:09 +02:00
Romain Neutron
8d5f713ef8 Merge branch 'Dev' of github.com:alchemy-fr/Phraseanet into Dev 2012-04-13 16:34:36 +02:00
Romain Neutron
adddfa18c3 Fix template generator 2012-04-13 16:33:51 +02:00
Nicolas Le Goff
b3d37ca7b0 Merge branch 'fix_native_auth' into Dev 2012-04-13 15:50:02 +02:00
Nicolas Le Goff
636f6dc21d fix native auth flow 2012-04-13 15:47:29 +02:00
Nicolas Le Goff
527b3639b5 implements oauth2.0 v9.0 Resource Owner Basic Credentials 2012-04-13 15:44:39 +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
a4c5141dfd add thumb extractor routes ( apply new thumbnail & confirm box) 2012-04-12 17:33:30 +02:00
Romain Neutron
45a4af8f1b Merge branch 'FixServerName' into Dev 2012-04-11 14:58:17 +02:00
Romain Neutron
a6ffc4f3ec Fix ServerName load 2012-04-11 14:35:56 +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
83857e6b1f mount tools controller 2012-04-05 19:22:08 +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
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
0c33e2819c Disable watermark for creation creator 2012-04-04 13:46:41 +02:00
Romain Neutron
cbb8670e6f Fix Typo 2012-04-04 10:44:05 +02: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
Romain Neutron
cc554909c0 Merge 3.6 fixes 2012-03-30 14:52:43 +02:00
Romain Neutron
0594b5135e Fix push user add box 2012-03-30 14:49:13 +02:00
Romain Neutron
bcd970e434 Default period is 10 seconds 2012-03-30 14:37:09 +02:00
Romain Neutron
46f1dba42a Default period is 10 seconds 2012-03-30 14:34:40 +02:00
Romain Neutron
30df661cb8 Fix unit tests 2012-03-30 13:46:08 +02:00
Romain Neutron
14cb8dcc41 Remove useless variable declaration 2012-03-30 13:44:48 +02:00
Romain Neutron
361ef0d9ff Fix typo 2012-03-30 13:43:50 +02:00
Romain Neutron
5d45635747 Remove Unused $app['debug'] 2012-03-30 13:43:31 +02:00
Romain Neutron
9acaf0b211 Use Composer for dependencies instead of git submodules 2012-03-30 13:39:44 +02:00
Romain Neutron
c9ff84c345 Fix unit tests 2012-03-30 13:34:42 +02:00
Romain Neutron
1b1e0627ed Fix Apc cache unit tests 2012-03-30 13:32:46 +02:00