hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 05:53:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,689 Commits 268 Branches 107 Tags
b23115d38d3fa40db2d2dba1cb784bcecbfe84d2
Commit Graph

457 Commits

Author SHA1 Message Date
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
Romain Neutron
10cc860860 Merge pull request #195 from nlegoff/master_fix_upload_status 
Fix #868 Status are not applicate when uploading a file on MASTER
 2012-08-31 07:48:07 -07:00
Nicolas Le Goff
42f5efac0d Fix #868 Status are not applicate when uploading a file 2012-08-31 16:38:41 +02:00
Nicolas Le Goff
9b6fcf58c9 Fix #868 Status are not applicate when uploading a file 2012-08-31 15:37:26 +02:00
Romain Neutron
0f7056dfed Normalize request calls 2012-08-23 14:15:21 +02:00
Romain Neutron
9f11445265 Namespaces cleanup 2012-07-27 12:26:12 +02:00
Romain Neutron
3db0f04680 Refactor move collection controllers 2012-07-26 17:22:46 +02:00
Romain Neutron
59e06043d2 Substitute helper by record request in Basket / Feeds / Tools / Tooltips 2012-07-26 15:38:57 +02:00
Romain Neutron
d022ff69c7 Remove use of databox singleton 2012-07-26 12:29:44 +02:00
Romain Neutron
8af83d0a00 Fix temporary bug 2012-07-25 13:56:52 +02:00
Romain Neutron
3395ec84e4 Remove last serializers 2012-07-25 12:46:13 +02:00
Romain Neutron
124deef3be Cleanup 2012-07-25 12:09:52 +02:00
Romain Neutron
429173838a Refactor Tooltip controller 2012-07-25 11:39:34 +02:00
Romain Neutron
ee5ee6f24e Refactor upload controller 2012-07-25 11:24:37 +02:00
Romain Neutron
94f04110ac Refactor user preferences 2012-07-25 11:21:33 +02:00
Romain Neutron
a4ebff35d2 Refactor user lists 2012-07-25 11:20:51 +02:00
Romain Neutron
0247a47497 Refactor route workzone 2012-07-25 11:02:04 +02:00
Romain Neutron
8bebadffad Refactor move collection 2012-07-24 19:51:14 +02:00
Romain Neutron
58e5053a8c Refactor Basket controller code 2012-07-24 19:39:16 +02:00
Romain Neutron
a9bdeefcde Remove inline redirection 2012-07-24 19:13:21 +02:00
Romain Neutron
89737fb5e4 Remove serializer 2012-07-24 19:01:06 +02:00
Romain Neutron
4dcb9b8be1 Update templates filepaths 2012-07-24 13:12:24 +02:00
Romain Neutron
2a4a3f3ec8 Enable Twig service provider 2012-07-24 13:11:26 +02:00
Romain Neutron
c278878c9e Merge with Dev 2012-07-19 14:12:38 +02:00
Romain Neutron
b3ac109d71 Fix tooltip display + Fix usrlist route 2012-07-19 14:09:57 +02:00
Romain Neutron
3169171952 Fix tests and templates 2012-07-19 13:27:39 +02:00
Romain Neutron
6a695e7e5d Code cleanup 2012-07-18 19:11:25 +02:00
Romain Neutron
3812399a35 Add Phraseanet Service Provider and Phraseanet Application 2012-07-18 18:07:34 +02:00
Romain Neutron
20c871136a Fix quarantine 2012-07-11 15:16:26 +02:00
Romain Neutron
c0ecd0153c Merge pull request #155 from nlegoff/tickets 
Tickets
 2012-07-10 02:41:56 -07:00
Nicolas Le Goff
06eecb913f fix #777 preview in quarantine 2012-07-03 14:40:42 +02:00
Nicolas Le Goff
8be60cf3c9 remove multi submit on move record action 
fix cs

fix typo
 2012-06-26 12:50:22 +02:00
Romain Neutron
021efdd354 Merge pull request #150 from nlegoff/fix_tickets 
Fix tickets
 2012-06-26 03:32:00 -07:00
Nicolas Le Goff
496dd063c9 add end user message when he tries to add element when no active basket 2012-06-26 11:44:17 +02:00
Nicolas Le Goff
270a95d7b3 fix #754 remove media queries on canva as they break image ratio 
fix typo

fix typo && add possibility for user email validation when user is created from admin panel

bug fixes

fix

fix typo

fix typo

send send_credential mail out of the model
 2012-06-22 19:02:14 +02:00
Nicolas Le Goff
48ada23da4 fix #747 Rename a basket reload all production application 2012-06-22 19:02:13 +02:00
Romain Neutron
e713b9edc6 Fix UploadFile renaming 
Fix Manager Tests

Update dependencies
 2012-06-19 18:39:33 +02:00
Romain Neutron
7018ba0a24 Update dependencies 
Fix controller declaration

Fix PdfTotext use
 2012-06-19 18:39:33 +02:00
Romain Neutron
4c7463cf29 Update to the latest silex API 2012-06-19 18:39:33 +02:00
Romain Neutron
873bf16c6b Fix type detection on upload 2012-06-19 18:39:32 +02:00
Romain Neutron
8e62810671 Merge pull request #135 from nlegoff/uploader_ie 
Uploader ie
 2012-06-19 09:38:55 -07:00
Nicolas Le Goff
44053c32c3 add compatibilité for IE 7 & 8 for html5 uploader 
upload compatible IE

fix typo

fix typo
 2012-06-19 18:18:47 +02:00
Romain Neutron
346ae1bc7d Merge pull request #134 from nlegoff/tickets 
Tickets
 2012-06-19 09:11:27 -07:00
Nicolas Le Goff
4edb26c6c6 fix #728 check if thumbExtractor is supported 
remove fileReader its not needed

fix unit tests

fix typo

remove unecessary message
 2012-06-19 18:08:40 +02:00
Nicolas Le Goff
16cb63b34e fix #742 add images to a basket from story detailled view 
remove console.log
 2012-06-19 18:00:45 +02:00
Nicolas Le Goff
ec15265af7 fix #726 no thumbnail in quarantaine for all media types except images 2012-06-19 17:17:16 +02:00
Romain Neutron
e28184167e Fix CS 2012-06-19 10:40:14 +02:00
Romain Neutron
50cf4ab8c8 Use mediavorus as core service 2012-06-19 10:17:14 +02:00
Romain Neutron
f4f408ef0f Add ebaility to change the feed for a feed entry 2012-06-19 10:16:07 +02:00