hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 12:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,182 Commits 268 Branches 107 Tags
a15ee1d729ef348f6d291671434e16d2cc7b51ef
Commit Graph

1439 Commits

Author SHA1 Message Date
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
jygaulier
39c3f97460 Merge branch 'BusinessFields' of github.com:alchemy-fr/Phraseanet into BusinessFields 2012-03-22 19:54:06 +01:00
jygaulier
d22a360a12 BusinessFields : add fake collist to phrasea_query2(...) to quick test 2012-03-22 19:53:50 +01:00
Romain Neutron
fc926dbe33 Fix Upgrade 2012-03-22 18:51:25 +01:00
Romain Neutron
815a15fe5e Add businessfields option to FTP 2012-03-22 18:26:20 +01:00
Romain Neutron
1a936120ed Fix Upgrade 2012-03-22 17:41:01 +01:00
Romain Neutron
97b5632017 Fix bug serialization export 2012-03-22 17:12:24 +01:00
Romain Neutron
31165c6816 Add business fields options in export dialog 2012-03-22 17:04:22 +01:00
Romain Neutron
63595e9dee Implements BusinessFields in export 2012-03-22 16:38:07 +01:00
Romain Neutron
b694b6bb6d Implements BusinessFields in serializer 2012-03-22 16:37:34 +01:00
Romain Neutron
e09588aec3 Merge branch '361' into BusinessFields 2012-03-22 15:26:57 +01:00
Romain Neutron
5475a5b4ea Merge branch '361' into Dev 2012-03-22 15:26:45 +01:00
Romain Neutron
b35bea771f Baskets cleanup 2012-03-22 15:22:41 +01:00
jygaulier
3d53ef9f23 allow search on business fields (last parm of phrasea_query2 = TRUE) 2012-03-21 20:31:33 +01:00