hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 14:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,967 Commits 268 Branches 107 Tags
4310cae3620140085a50b72e39e40d08768e901b
Commit Graph

190 Commits

Author SHA1 Message Date
Nicolas Le Goff
f3cc575674 add bas/collection controller 2012-09-03 18:08:55 +02:00
Romain Neutron
f27d50be81 Merge with 3.7 2012-08-31 20:30:27 +02:00
Nicolas Le Goff
f8299a8ce2 Fix #862 Upload multiple IE 2012-08-31 16:57:43 +02:00
Nicolas Le Goff
367cf7c2a4 add /login/authenticate/ 
remove  login/authenticate controller

add generateEmail function

move parent::tearDownAfterClass at the end od the function

use twitter bootstrap alert component

Update doc blocks & fix issues

add XMLHTTPRequest to PhraseanetPHPUNIt framework

fix tests

remove var_dump

refactor postlog process

fix URI's

fix redirection URI
 2012-08-21 17:32:00 +02:00
Romain Neutron
035d228f8a Update templates filepaths 2012-07-24 13:12:25 +02:00
Romain Neutron
1d7418fd60 Update templates filepaths 2012-07-24 13:12:24 +02:00
Romain Neutron
be3b098747 Rename twig templates 2012-07-24 13:12:22 +02:00
Romain Neutron
b6b080b561 Cleanup 2012-07-24 13:12:21 +02:00
Romain Neutron
733cc8850d Cleanup 2012-07-24 13:11:31 +02:00
Romain Neutron
fa49568bdf Remove mobile report 2012-07-24 13:11:31 +02:00
Romain Neutron
53569f5087 Remove mobile report 2012-07-24 13:11:30 +02:00
Romain Neutron
317d1b90d1 Remove YUI 2012-07-24 13:11:29 +02:00
Romain Neutron
c857a878af Merge branch '3.8' 2012-07-24 12:32:08 +02:00
Romain Neutron
7eefbe1c76 Fix bootstrap conflict 2012-07-23 12:42:35 +02:00
Nicolas Le Goff
650945c642 fix #835 Collecton selection bug in multiselect menu 2012-07-19 18:54:40 +02:00
Romain Neutron
ffeab2f29f Update asset urls 2012-07-18 19:16:46 +02:00
Nicolas Le Goff
89d7da75ac delete login 2012-07-18 17:48:27 +02:00
Nicolas Le Goff
a9941c9039 Update flowplayer 2012-07-18 16:36:37 +02:00
Romain Neutron
5a51a0fddd Remove video-js support 2012-07-18 16:07:46 +02:00
Romain Neutron
35207ca558 Remove buggy code 2012-07-18 15:54:16 +02:00
Romain Neutron
c1ec4d5303 Fix lightbox video display 2012-07-17 16:42:27 +02:00
Romain Neutron
d689dc0639 Merge pull request #161 from romainneutron/Fixes 
Fixes
 2012-07-17 06:22:43 -07:00
Romain Neutron
ca1341b55a Update twig templates 2012-07-17 15:01:12 +02:00
Romain Neutron
a911e0745a Fix video-js resize 2012-07-16 17:29:54 +02:00
Nicolas Le Goff
f68571b045 fix #789 HTML5 video display on safari 
remove debug

revert modifications
 2012-07-12 14:04:15 +02:00
Romain Neutron
6a24a073d4 Fix tooltip display 2012-06-06 10:36:32 +02:00
Romain Neutron
ce8170b87b catch VideoJS exceptions 2012-06-04 18:36:56 +02:00
Romain Neutron
f867b7b965 Disable tooltip on hide 2012-06-04 14:27:08 +02:00
grosroro
9ca8625aa2 Fix Video JS display 2012-06-01 19:38:29 +02:00
Romain Neutron
44b6f14e02 Merge pull request #115 from romainneutron/Cache 
Cache
 2012-06-01 08:08:40 -07:00
Romain Neutron
b900fdcdd1 remove debug 2012-06-01 16:56:26 +02:00
Nicolas Le Goff
8951415770 remove old upload/lazaret 2012-06-01 16:39:28 +02:00
Nicolas Le Goff
5665d6b035 fix #684, #683, #681, #680, #676, #675, #674, #673, #672, #669, #668, #667 2012-06-01 12:29:54 +02:00
Romain Neutron
caf1e69370 Add HTML5 features 2012-05-30 16:35:24 +02:00
Nicolas Le Goff
e0a874c2f1 fix #633 Javascript jquery.upload fails 2012-05-25 21:10:11 +02:00
Romain Neutron
de46ddc9e5 Update tooltip display 
based on ratio, remove the old close-box
 2012-05-23 13:08:44 +02:00
Romain Neutron
d86464b16b Tooltip enhancement 2012-05-22 20:05:23 +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
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
ade22295ad Fix CS 2012-04-26 00:55:53 +02:00
Romain Neutron
6a4708bee5 Add debug line 2012-04-20 11:13: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
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
c3d66f574d Merge branch 'FixBasketSort' into Dev 2012-04-10 14:09:23 +02:00
Romain Neutron
96080dfd1a Fix reorder box selection 2012-04-10 14:08:01 +02:00
Nicolas Le Goff
c953190ed6 Fix error page 2012-03-30 14:59:38 +02:00