Commit Graph

749 Commits

Author SHA1 Message Date
Romain Neutron
dd608bdb82 Fix alternateSearchBox 2012-02-28 17:43:57 +01:00
Romain Neutron
aca7ff6096 Fix CSS for pads 2012-02-28 17:27:59 +01:00
Romain Neutron
fa1b30e6e5 Merge with master 2012-02-28 16:54:25 +01:00
Romain Neutron
a1797ece76 Fix Download Client 2012-02-28 16:49:31 +01:00
Romain Neutron
ced93eec7b Fix CSS Client 2012-02-28 16:26:01 +01:00
Romain Neutron
a2ae5d395e Fix client 2012-02-28 16:18:12 +01:00
Romain Neutron
69fec3d360 Fix page selection 2012-02-28 16:06:57 +01:00
Romain Neutron
2412c41553 GFix client publications 2012-02-28 16:02:58 +01:00
Romain Neutron
daf4fe2a03 Removed ORM table drop proposal 2012-02-28 15:28:56 +01:00
Romain Neutron
b91fe2456f Fix VocabId 2012-02-28 15:08:39 +01:00
Romain Neutron
2b9e86cb20 Fix loader 2012-02-28 14:28:06 +01:00
Romain Neutron
379926ccf5 Remove unused Autoload 2012-02-28 13:55:24 +01:00
Romain Neutron
a805569b73 Cleanup 2012-02-28 13:38:55 +01:00
Romain Neutron
660882b428 Fix Safari text alignment 2012-02-27 21:58:23 +01:00
Romain Neutron
d8a5df1c49 Fix usr_id 2012-02-24 12:07:56 +01:00
Romain Neutron
42fe4894ab Fix typo 2012-02-24 10:47:17 +01:00
Romain Neutron
2f3ea21b99 Close edit window after editing 2012-02-24 10:42:40 +01:00
Ysolyne Gresille
ec52bf511e Graphic integration oauth (corrections) 2012-02-23 18:52:22 +01:00
Ysolyne Gresille
160f9ff986 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-02-23 18:50:33 +01:00
Nicolas Le Goff
14f8762fcf Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-02-23 15:10:32 +01:00
Nicolas Le Goff
6ca77f84ee Merge branch 'master' of github.com:alchemy-fr/Phraseanet 2012-02-23 15:08:50 +01:00
Nicolas Le Goff
079dd80e14 fix image scroll & image display 2012-02-23 15:08:09 +01:00
Romain Neutron
c29dcd94e7 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-02-23 14:54:26 +01:00
Romain Neutron
906a26d11d Fix Basket/Story sorting 2012-02-23 14:47:56 +01:00
Nicolas Le Goff
db1a77e877 replace player-scroll 2012-02-23 14:35:57 +01:00
Nicolas Le Goff
5b3eba0d97 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-02-23 12:47:17 +01:00
Nicolas Le Goff
bfbc51c5d2 replace player_homelink 2012-02-23 12:45:24 +01:00
Romain Neutron
1f578810f8 Fix basket download 2012-02-23 11:33:55 +01:00
Romain Neutron
9bd67a5361 Refactor Phrasea::start 2012-02-23 10:29:19 +01:00
Romain Neutron
0dcfec55c8 Refactor Configuration 2012-02-22 18:06:58 +01:00
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
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
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
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
Romain Neutron
a84954cf78 Cleanup 2012-02-21 16:53:28 +01:00
Romain Neutron
65f62f9c10 Refactor Appbox 2012-02-21 16:25:40 +01:00
Romain Neutron
df745a69fb Refactor Appbox 2012-02-21 16:17:42 +01:00
Romain Neutron
375fd3d493 Refactor Appbox 2012-02-21 16:01:55 +01:00
Romain Neutron
80f22ca1fc Refactor Appbox 2012-02-21 15:56:34 +01:00
Romain Neutron
566b8fc6be Refactor Appbox 2012-02-21 15:52:25 +01:00
Romain Neutron
ef08ff7059 Refactor Appbox 2012-02-21 15:29:56 +01:00
Romain Neutron
8cffc8aca1 Refactor Appbox 2012-02-21 15:26:18 +01:00
Romain Neutron
b4872b2f82 Refactor Appbox 2012-02-21 15:17:58 +01:00
Romain Neutron
4dcb3959e3 Refactor Appbox 2012-02-21 15:12:58 +01:00
Romain Neutron
4b018c7e8c Refactor Appbox 2012-02-21 15:07:34 +01:00
Romain Neutron
a65df4bb58 Refactor Appbox 2012-02-21 15:04:50 +01:00
Romain Neutron
68e8eb328c Hnadle error in Lightbox API 2012-02-17 18:48:01 +01:00