Commit Graph

749 Commits

Author SHA1 Message Date
Romain Neutron
c233323c68 Mount upload and lazaret controllers 2012-05-22 20:00:14 +02:00
jygaulier
02a019d9e7 add some tests 2012-05-22 11:24:55 +02:00
jygaulier
823a3ed89e code formating 2012-05-22 11:22:19 +02:00
jygaulier
22c492f69d restore code format after netbeans update 2012-05-22 11:22:19 +02:00
jygaulier
37adb06965 many comments of last pull request applied 2012-05-22 11:18:01 +02:00
jygaulier
a816387804 many renames to camelcase 2012-05-22 11:11:29 +02:00
jygaulier
1dc54a2e9d removed debug 2012-05-22 10:48:43 +02:00
jygaulier
8fbb2071dc fixes for windows 2012-05-22 10:48:41 +02:00
jygaulier
fbaa2e16a2 fixes for windows 2012-05-22 10:48:41 +02:00
jygaulier
ddb33090c0 fixes for classic upload (not flash) 2012-05-22 10:48:41 +02:00
Nicolas Le Goff
8afb006b21 fix typo 2012-05-21 21:08:40 +02:00
Nicolas Le Goff
2a3b82aff5 add js file dependency for upload in prod module 2012-05-21 21:08:40 +02:00
Nicolas Le Goff
ce4786022a add upload library 2012-05-21 21:08:39 +02:00
Nicolas Le Goff
06fdf0d23b Add submodules 2012-05-21 21:08:38 +02:00
Ysolyne Gresille
76260364aa Updtae bootstrap / skins 2012-05-21 14:27:52 +02:00
Nicolas Le Goff
21c2d15754 fix record deletion from story workzone && enhance deletion "when no elements selected the story or basket itself is deleted" 2012-05-10 14:54:47 +02:00
Romain Neutron
be5bbaa8bd Cleanup 2012-05-05 10:55:32 +02:00
Nicolas Le Goff
1fed596631 fix typo 2012-05-04 20:40:33 +02:00
Nicolas Le Goff
6f998c9e98 enhanced bridge ui 2012-05-04 15:03:17 +02:00
Nicolas Le Goff
3ce19dad5a Youtube new authentication 2012-05-03 20:57:29 +02:00
Nicolas Le Goff
7ef5e36119 Merge pull request #48 from nlegoff/fix_build
Patch Phraseanet-navigator
2012-04-27 10:17:29 -07:00
Nicolas Le Goff
f0b9fc3f20 set phraseanet navigator to desactivate state by default, make exception handling nicer 2012-04-27 19:01:00 +02:00
Nicolas Le Goff
7627e3774a catch uncatched exceptions Exception_setup_UpgradeAlreadyStarted & Exception_Setup_FixBadMailAdresses 2012-04-27 18:55:35 +02:00
Romain Neutron
8f29c24a0e Merge with master 2012-04-27 18:54:00 +02:00
Romain Neutron
2c83c77d9a Fix date Search / Selection / Default sort 2012-04-27 18:39:42 +02:00
Romain Neutron
093869d3d0 Add devices in API answer / CS / Fixes
Add tests to media subdefs
Fix CS
Add Mplayer to build
Fix Alchemy\Phrasea\Exceptions
Add media_subdef etags
2012-04-27 16:46:52 +02:00
Nicolas Le Goff
90b3870901 add grant_type password for oauth2Client, handle trusted client such as Phraseanet Navigator 2012-04-26 18:23:44 +02:00
Romain Neutron
7d9eb63246 Remove unused package annotation 2012-04-26 02:09:59 +02:00
Romain Neutron
70519a471a Update copyright year 2012-04-26 02:06:29 +02:00
Romain Neutron
adc74dc1d8 Add curly braces 2012-04-26 02:00:18 +02:00
Romain Neutron
33b10d6746 Add curly braces 2012-04-26 01:55:12 +02:00
Romain Neutron
ade22295ad Fix CS 2012-04-26 00:55:53 +02:00
Romain Neutron
dd994a9bd6 Fix CS 2012-04-25 17:38:49 +02:00
Nicolas Le Goff
c201ad301a add api/ route which provide informations on supported api versions 2012-04-24 17:47:04 +02:00
Nicolas Le Goff
04c6b93775 add rewrite rules 2012-04-24 17:43:15 +02:00
Nicolas Le Goff
66ca3c96c4 add missing bootstrap for API application 2012-04-24 14:25:49 +02:00
Romain Neutron
6a4708bee5 Add debug line 2012-04-20 11:13:13 +02:00
Romain Neutron
c5859e25eb Merge branch 'Fix' into Dev 2012-04-20 10:58:35 +02:00
Romain Neutron
01af439f3a Fix webkit selection 2012-04-20 10:57:21 +02:00
Romain Neutron
332d67069d 3.7 routes 2012-04-17 13:41:14 +02:00
Romain Neutron
8b03568108 Fix installer 2012-04-13 17:45:09 +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
e513a75d86 delete chgthumb, newimg, rotate, img function, chgdocument files 2012-04-12 17:50:13 +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
1783e46f8e add thumb extractor css 2012-04-12 17:31:38 +02:00
Nicolas Le Goff
4365f1ef27 add thumb extractor icons 2012-04-12 17:31:15 +02:00
Nicolas Le Goff
de6c492c4f add thumb extractor library 2012-04-12 17:30:46 +02:00
Nicolas Le Goff
d6558b33ba add pixastic and thumbExtractor to prod application 2012-04-12 17:30:33 +02:00
Nicolas Le Goff
09a6a2ee3c add pixastic js library 2012-04-12 17:29:39 +02:00
Romain Neutron
45a4af8f1b Merge branch 'FixServerName' into Dev 2012-04-11 14:58:17 +02:00