Commit Graph

2632 Commits

Author SHA1 Message Date
Nicolas Le Goff
e1bfdb0bb3 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-02-22 16:58:00 +01:00
Nicolas Le Goff
33b225a290 fix oauth app creation bug 2012-02-22 16:55:50 +01:00
Romain Neutron
98b944cdf2 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-02-22 12:39:37 +01:00
Romain Neutron
8c840091d7 Merge branch 'HotFixCache' into 3.6 2012-02-22 12:39:17 +01:00
Romain Neutron
2cb18c5d78 Download elements without watermark when pushed 2012-02-22 12:22:50 +01:00
Romain Neutron
dc1ec6df7d Fix cache asynchro 2012-02-22 12:18:30 +01:00
Ysolyne Gresille
c42e92d7f3 Graphic integration oauth correction 2012-02-22 11:58:24 +01:00
Ysolyne Gresille
775420def8 graphic integration oauth correction 2012-02-22 11:53:31 +01:00
Romain Neutron
991a43fcd5 Enhanced EnsureProductionSettings 2012-02-22 11:43:20 +01:00
Romain Neutron
1fce095244 Cleanup 2012-02-22 11:42:52 +01:00
Ysolyne Gresille
a08f072315 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-02-22 11:24:24 +01:00
Ysolyne Gresille
df4879bdb5 Move exception in / Scope 2012-02-22 11:24:07 +01:00
Ysolyne Gresille
21c18422f7 Add DS_Store to gitignore 2012-02-22 11:23:10 +01:00
Ysolyne Gresille
0d2c65b7de graphic integration oauth 2012-02-22 11:22:04 +01:00
Ysolyne Gresille
59ff33c6e3 add html5 tools 2012-02-22 11:21:23 +01:00
Nicolas Le Goff
35d6d86756 fix namespace bug 2012-02-22 11:18:54 +01:00
Romain Neutron
7eaa468907 Fix Upgrade Script 2012-02-21 18:24:05 +01:00
Romain Neutron
45c7e9cb8d New config file 2012-02-21 18:04:25 +01:00
Romain Neutron
3523f0364d Fix tests 2012-02-21 18:03:22 +01:00
Romain Neutron
00fad09ed8 Fix tests 2012-02-21 18:03:05 +01:00
Romain Neutron
c3aa3b135d Rename cache tests 2012-02-21 17:43:39 +01:00
Romain Neutron
1a3eb9ed1f Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-02-21 17:29:30 +01:00
Romain Neutron
5ee18bacc7 Update Cache Manager 2012-02-21 17:11:02 +01:00
Romain Neutron
0009a4d5cf Cleanup 2012-02-21 16:54:00 +01:00
Romain Neutron
a84954cf78 Cleanup 2012-02-21 16:53:28 +01:00
Romain Neutron
5e8f21b65b Refactor Cache services 2012-02-21 16:51:33 +01:00
Romain Neutron
b91fc5e9b2 Refactor Cache services 2012-02-21 16:51:12 +01:00
Romain Neutron
d6637f016d Refactor Cache services 2012-02-21 16:50:29 +01:00
Romain Neutron
c91a84937c Refactor Cache services 2012-02-21 16:49:54 +01:00
Nicolas Le Goff
9882095b80 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-02-21 16:42:01 +01:00
Nicolas Le Goff
194359503e fix basketStealElementTest 2012-02-21 16:41:35 +01:00
Romain Neutron
2c0a3f619f Refactor ServiceBuilder 2012-02-21 16:34:31 +01:00
Romain Neutron
68183a5b22 Refactor ServiceBuilder 2012-02-21 16:34:02 +01:00
Romain Neutron
4f8d7eb189 Refactor ServiceBuilder 2012-02-21 16:33:27 +01:00
Romain Neutron
4a9489f2f5 Refactor ServiceBuilder 2012-02-21 16:32:53 +01:00
Romain Neutron
3103a23d98 Refactor ServiceBuilder 2012-02-21 16:32:24 +01:00
Romain Neutron
4ab989eaca Refactor ServiceBuilder 2012-02-21 16:31:37 +01:00
Romain Neutron
cc8acb342e Refactor Appbox 2012-02-21 16:26:07 +01:00
Romain Neutron
65f62f9c10 Refactor Appbox 2012-02-21 16:25:40 +01:00
Romain Neutron
0a85cf2c32 Refactor Appbox 2012-02-21 16:25:07 +01:00
Romain Neutron
48cf1af785 Refactor Appbox 2012-02-21 16:23:05 +01:00
Romain Neutron
164a2e396f Refactor Appbox 2012-02-21 16:19:51 +01:00
Romain Neutron
dc51dd295d Refactor Appbox 2012-02-21 16:19:38 +01:00
Romain Neutron
7d41a36694 Refactor Appbox 2012-02-21 16:19:08 +01:00
Romain Neutron
df745a69fb Refactor Appbox 2012-02-21 16:17:42 +01:00
Romain Neutron
ec4ec4931d Refactor Appbox 2012-02-21 16:16:25 +01:00
Romain Neutron
dbd0b0c437 Refactor Appbox 2012-02-21 16:15:45 +01:00
Romain Neutron
b6b721ddb7 Refactor Appbox 2012-02-21 16:13:27 +01:00
Romain Neutron
a21d830f61 Refactor Appbox 2012-02-21 16:11:38 +01:00
Romain Neutron
e217a49f6a Refactor Appbox 2012-02-21 16:10:16 +01:00