hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 02:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,518 Commits 268 Branches 107 Tags
a9bb23fc5101452dd3ce8823895518f2fb1eb75c
Commit Graph

5518 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Neutron
a9bb23fc51 Merge branch '3.7' 2013-06-28 20:22:20 +02:00
Romain Neutron
08c770e818 Merge pull request #441 from nlegoff/some_bootstrap 
[3.8] Fix and tweak admin CSS using twitter bootstrap
 2013-06-28 11:17:04 -07:00
Romain Neutron
54dc6da9af Merge pull request #442 from nlegoff/fix_prod_issues 
[3.8] Fix some prod issues
 2013-06-28 11:00:47 -07:00
Romain Neutron
2c5f05c113 Merge pull request #445 from nlegoff/fix_1203 
[3.7] Fix #1203
 2013-06-28 10:58:24 -07:00
Romain Neutron
db8e599b2f Merge pull request #444 from nlegoff/sharing_window 
[3.8] Fix #1218 & 1219 Enhance sharing window
 2013-06-28 10:56:37 -07:00
Romain Neutron
be0c88dd45 Merge pull request #446 from romainneutron/debug 
[WIP] Fix travis build
 2013-06-28 10:55:50 -07:00
Romain Neutron
afd272987f Revert ffmpeg and XPDF install 2013-06-28 19:26:56 +02:00
Romain Neutron
0bac2d79d2 Move phraseanet console calls to scripts 2013-06-28 18:50:24 +02:00
Romain Neutron
910190af24 Speed up build 2013-06-28 18:49:48 +02:00
Romain Neutron
fd7b59a068 Remove extra dependencies 2013-06-28 18:49:48 +02:00
Romain Neutron
2307a0b038 Replace old files with new ones 2013-06-28 18:49:47 +02:00
Romain Neutron
94d7a12d1d Remove extra items 2013-06-28 18:49:46 +02:00
Nicolas Le Goff
9297d2f6b5 Fix #1203 Do not display story creation form if user do not have appropriate rights 2013-06-28 17:51:44 +02:00
Nicolas Le Goff
0618cefb8f Addressed @romainneutron's comments 
Fixes
 2013-06-28 17:31:50 +02:00
Nicolas Le Goff
ac6b3e439a Fix #1218 & 1219 Enhance sharing window 2013-06-28 17:15:48 +02:00
Romain Neutron
75e528d350 Add subdef cleanup on travis, move upgrade to scripts to catch errors 2013-06-28 16:08:20 +02:00
Nicolas Le Goff
ab6cf56fd6 Adressed @romainneutron's comments 2013-06-28 16:01:48 +02:00
Nicolas Le Goff
4a5a764d7d Addressed @romainneutron comments 2013-06-28 15:40:58 +02:00
Nicolas Le Goff
b5313cc540 Use bootstrap tool 2013-06-28 15:40:58 +02:00
Nicolas Le Goff
746aace93b Fix bad controller binding 2013-06-28 15:35:01 +02:00
Nicolas Le Goff
8599775a11 Fix #1208 Broken publication reload after rename 2013-06-28 15:20:19 +02:00
Nicolas Le Goff
06f2ebcc0a Fix #1212 Broken advanced search 2013-06-28 13:13:07 +02:00
Nicolas Le Goff
fd6a518e47 Fix #1217 Broken tooltip 2013-06-28 13:12:40 +02:00
Romain Neutron
fbedd58a73 Add missing test file 2013-06-28 11:03:35 +02:00
Romain Neutron
d955229cc9 Merge pull request #437 from romainneutron/mediavorus 
[3.8] Mediavorus bump
 2013-06-27 15:18:46 -07:00
Romain Neutron
e155089cac Tweaks and fixes 2013-06-28 00:16:34 +02:00
Nicolas Le Goff
563d2e2c55 Adressed neutron's comment 2013-06-28 00:16:34 +02:00
Nicolas Le Goff
0aa90dd6cc Revert patch 2013-06-28 00:16:34 +02:00
Nicolas Le Goff
e389acd4bf Remove typo 2013-06-28 00:16:34 +02:00
Nicolas Le Goff
b5dbd37740 Adress last comment 2013-06-28 00:16:34 +02:00
Nicolas Le Goff
2ea0f3af41 Adressed neutron's comments 
Add extra line

Fix issue

Optimization

Adress comments
 2013-06-28 00:16:34 +02:00
Nicolas Le Goff
5adae9eb42 Revert hudson changes 2013-06-28 00:16:34 +02:00
Nicolas Le Goff
4e39265f5e Rename subscriber 2013-06-28 00:16:34 +02:00
Nicolas Le Goff
0ab66c095f Explicitly set HTTP cache to public when delivering thumbnail 2013-06-28 00:16:34 +02:00
Nicolas Le Goff
01a36ee9f7 Use power of symfony binary file response 
Add commands

Fix typo

Remove extra line
 2013-06-28 00:16:34 +02:00
Nicolas Le Goff
7fc9eb3010 Add logger 2013-06-28 00:16:33 +02:00
Nicolas Le Goff
6cf34c53c3 PR's comments adressed 
Remove pragma header

Remove extra line

PR'S comments adressed

Fix CS

PR's comments adressed

Remove seless tests
 2013-06-28 00:16:33 +02:00
Nicolas Le Goff
fd8f63fd29 Add File Serve Factory as a service 2013-06-28 00:16:33 +02:00
Romain Neutron
692f92176f Update dependencies 2013-06-27 18:55:11 +02:00
Romain Neutron
ce0a8b13ab Update to latest mediavorus 2013-06-27 18:27:32 +02:00
Romain Neutron
9def3e4624 Merge pull request #438 from jygaulier/master-fix1210 
[3.8] Master fix1210
 2013-06-27 09:17:19 -07:00
Romain Neutron
2a19d351c9 Merge pull request #439 from nlegoff/fix_php_detection 
[3.8] Fix php detection
 2013-06-27 07:40:49 -07:00
Romain Neutron
ca4b0ac255 Update to latest rebase 2013-06-27 16:40:25 +02:00
Romain Neutron
1a7b53593e Update to latest rebase 2013-06-27 16:37:33 +02:00
Nicolas Le Goff
4fa166c846 Fix php detection 2013-06-27 16:24:27 +02:00
jygaulier
6d631200ee fix #1210 2013-06-27 15:43:45 +02:00
jygaulier
c378bbdfce fix #1210 2013-06-27 15:43:31 +02:00
Romain Neutron
11f78307d9 Add branch alias 2013-06-27 15:13:33 +02:00
Romain Neutron
337bcc98b7 Merge pull request #432 from romainneutron/media-alchemyst 
[3.8] Bump to Media alchemyst 0.3
 2013-06-27 04:49:49 -07:00
Romain Neutron
76b76ce16f Merge pull request #436 from jygaulier/master-fix1150 
[3.8] fix #1150
 2013-06-27 04:48:18 -07:00