hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 20:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,868 Commits 268 Branches 107 Tags
cc490082b521f0cea79aa1920a0d26d104070093
Commit Graph

902 Commits

Author SHA1 Message Date
Romain Neutron
722c094b5f Remove databox subde mediatypes 2012-04-24 16:19:37 +02:00
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
8025622378 Move tests at root 2012-04-14 11:57:28 +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
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
Romain Neutron
a2aa3b6840 Fix Paginator use 2012-04-04 20:06:50 +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
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
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
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
14cb8dcc41 Remove useless variable declaration 2012-03-30 13:44:48 +02:00
Romain Neutron
9acaf0b211 Use Composer for dependencies instead of git submodules 2012-03-30 13:39:44 +02:00
Romain Neutron
2bb663c096 Merge branch 'FixPermalinks' into Dev 2012-03-27 18:56:06 +02:00
Romain Neutron
64b80b5d45 Fix token renewal on subdefinitions re-creation 2012-03-27 18:55:15 +02:00
Romain Neutron
fd3d46ddcd Merge branch 'FixExtension' into Dev 2012-03-27 15:21:37 +02:00
Romain Neutron
dfe6a75846 Fix extension parameters load 2012-03-27 15:17:54 +02:00
Romain Neutron
87ad76fc02 Fix check extension for businessfields 2012-03-27 15:09:53 +02:00
Romain Neutron
5427d334c3 Fix tasks for 3.6+ 2012-03-27 14:43:05 +02:00
Romain Neutron
e11ac4275e Merge branch 'Dev' of github.com:alchemy-fr/Phraseanet into Dev 2012-03-27 13:39:53 +02:00
Romain Neutron
a2554577f7 Merge pgrade scripts 2012-03-27 13:39:12 +02:00
Romain Neutron
5b0963e5f2 Fix upgrade scripts for large volumes 2012-03-27 13:35:07 +02:00
jygaulier
8d504605e6 fix : business fields were not serialized in xml 2012-03-26 17:19:54 +02:00
Romain Neutron
c0dfe1657b Merge branch 'BusinessFields' into Dev 2012-03-26 14:21:16 +02:00
Romain Neutron
938cd9276d Merge branch 'master' into Dev 2012-03-26 14:20:52 +02:00
Romain Neutron
5acfdf0f3c Merge with 3.5 2012-03-26 14:12:52 +02:00
Romain Neutron
85f32e4e23 Add check on Video icon on video thumbnail 2012-03-26 13:57:50 +02:00
Romain Neutron
f85d159ea0 Add correct Exit status 2012-03-26 13:48:06 +02:00
Romain Neutron
b35ece6eab Remove metadata key 2012-03-26 13:31:27 +02:00
Romain Neutron
4d6cad987b Fix patches 2012-03-26 13:02:02 +02:00
Romain Neutron
1189cece49 Merge with master 2012-03-23 17:43:51 +01:00
Romain Neutron
a9ea620875 Fix DQL syntax 2012-03-23 17:41:01 +01:00
Romain Neutron
84c0d2cdf0 Fix unit tests 2012-03-23 17:39:39 +01:00
Romain Neutron
5bd6c9d629 Implements search engine queries 2012-03-23 13:56:10 +01:00
Romain Neutron
3de8375289 Implements business fields in search engines 2012-03-23 13:49:21 +01:00