Commit Graph

7283 Commits

Author SHA1 Message Date
Romain Neutron
ff5a3a6c16 Add dependency on Ratchet and react ZMQ 2014-02-15 11:38:50 +01:00
Romain Neutron
094b3f5c9d Merge branch '3.8'
Conflicts:
	lib/Alchemy/Phrasea/Core/CLIProvider/CLIDriversServiceProvider.php
	tests/Alchemy/Tests/Phrasea/Controller/SetupTest.php
2014-02-14 19:45:57 +01:00
Nicolas Le Goff
dcacfcc5f6 Merge pull request #955 from romainneutron/executable-finder-backport
[3.8] Backport executable finder to allow use of local npm package binaries
2014-02-14 19:44:11 +01:00
Romain Neutron
d1b6aee633 I dont want to know how this could have work before 2014-02-14 19:23:51 +01:00
Romain Neutron
c9080de1c5 I dont want to know how this could have work before 2014-02-14 19:21:47 +01:00
Romain Neutron
687667771d Backport executable finder to allow use of local npm package binaries 2014-02-14 18:52:00 +01:00
Nicolas Le Goff
caca9e7a89 Merge pull request #951 from romainneutron/psr-0
[3.9] Fix PSR-0 file naming
2014-02-14 16:51:27 +01:00
Romain Neutron
c5d3f97258 Fix PSR-0 file naming 2014-02-14 15:51:09 +01:00
Nicolas Le Goff
195d52ff08 Merge pull request #953 from romainneutron/fix-grunt-driver
[3.9] Fix grunt usage. It needs to be at Phraseanet root to work correctly as local npm package
2014-02-14 15:13:41 +01:00
Romain Neutron
0be7c3b848 Fix grunt usage. It needs to be at Phraseanet root to work correctly as local npm package 2014-02-14 14:40:35 +01:00
Romain Neutron
fa98c42ff3 Merge pull request #952 from nlegoff/fix_deps
[3.9] Fix jquery-galleria display in homepage
2014-02-14 14:08:58 +01:00
Romain Neutron
4a726d29d3 Fix latest merge 2014-02-14 13:22:27 +01:00
Nicolas Le Goff
9bb0d5892b Fix galleria loading 2014-02-14 12:34:33 +01:00
Romain Neutron
787e86aacf Fix latest merge 2014-02-14 11:59:15 +01:00
Romain Neutron
903f63cd32 Merge branch '3.8' 2014-02-14 11:43:55 +01:00
Nicolas Le Goff
8994bbc133 Merge pull request #946 from romainneutron/fix-1680
[3.8] Fix #1680 : Add support for custom extension to mime-type mapping
2014-02-14 11:41:38 +01:00
Nicolas Le Goff
c3c0110b7d Merge branch '3.8' 2014-02-13 21:44:23 +01:00
Romain Neutron
5694b4d98f Move JMS translation bundle from dev dependency to dependency 2014-02-13 20:16:55 +01:00
Nicolas Le Goff
0fa0162169 Merge pull request #950 from romainneutron/npm-packages
[3.9] Use npm packages for build
2014-02-13 20:03:45 +01:00
Romain Neutron
3e3a1765fa Use npm packages for build 2014-02-13 19:29:35 +01:00
Nicolas Le Goff
fad08dc337 Merge pull request #949 from romainneutron/cache-namespace-strategy
[3.8] Update cache namespace strategy to avoid collisions
2014-02-13 18:01:01 +01:00
Nicolas Le Goff
e02f6f0879 Merge pull request #948 from romainneutron/fix-feeds
[3.9] Fix Feed aggregate to suit the interface
2014-02-13 16:42:12 +01:00
Romain Neutron
ac8166706e Merge pull request #945 from nlegoff/fix1639
[3.9] Fix #1639 logs error in mocha phantom js
2014-02-13 16:40:01 +01:00
Romain Neutron
41ec3907c5 Merge branch '3.8' 2014-02-13 16:25:09 +01:00
Romain Neutron
9aa4e7abd8 Fix #1680 : Add support for custom extension to mime-type mapping 2014-02-13 16:22:41 +01:00
Nicolas Le Goff
5ebda2bb29 Merge pull request #947 from romainneutron/fix-1694
[3.8] Fix #1694 : Default flash subviews size are wrong
2014-02-13 16:22:34 +01:00
Romain Neutron
7f7d9c7753 Update cache namespace strategy to avoid collisions 2014-02-13 16:11:02 +01:00
Romain Neutron
172718fd88 Fix Feed aggregate to suit the interface 2014-02-13 13:42:09 +01:00
Romain Neutron
ee7004160e Fix #1694 : Default flash subviews size are wrong 2014-02-13 12:41:50 +01:00
Nicolas Le Goff
fe2300e6ca Fix #1639 logs error in mocha phantom js 2014-02-13 12:02:58 +01:00
Nicolas Le Goff
db1a23fe34 Fix latest merge 2014-02-13 12:02:17 +01:00
Nicolas Le Goff
7df2343ac4 Merge pull request #943 from romainneutron/locales
[3.9] Rename xliff files to xlf
2014-02-13 11:14:13 +01:00
Nicolas Le Goff
f4f063ad3e Merge branch '3.8'
Conflicts:
	templates/web/report/report_layout_child.html.twig
2014-02-13 11:12:26 +01:00
Romain Neutron
ea8f8fefe6 Fix translations to be imported by Pootle 2014-02-12 19:58:52 +01:00
Romain Neutron
b819de9a54 Rename xliff files to xlf 2014-02-12 19:58:51 +01:00
Romain Neutron
302e87714f Fix latest merge 2014-02-12 19:58:37 +01:00
Nicolas Le Goff
3870489db6 Merge pull request #942 from nlegoff/fix1685
[3.8] Fix #1685 Fix path for report activity
2014-02-12 11:30:04 +01:00
Nicolas Le Goff
2cf780ff76 Merge pull request #941 from nlegoff/fix1684
[3.8] Fix #1684 CSV report are empty
2014-02-12 11:29:46 +01:00
Romain Neutron
372fc86601 Use short array declarations 2014-02-11 18:44:31 +01:00
Romain Neutron
76048709ee Fix CS 2014-02-11 16:27:47 +01:00
Romain Neutron
e4ce070cde Fix latest merge 2014-02-11 15:26:51 +01:00
Nicolas Le Goff
1fcd920d6d Fix #1684 CSV report are empty 2014-02-11 14:05:56 +01:00
Nicolas Le Goff
a1e8b0d20d Fix #1685 Fix path for report activity 2014-02-11 12:45:09 +01:00
Nicolas Le Goff
8f0ae76dfa Fix latest merge 2014-02-11 11:51:19 +01:00
Nicolas Le Goff
6053a03b87 Merge branch '3.8'
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
	tests/Alchemy/Tests/Phrasea/Application/ApiTestCase.php
	tests/classes/PhraseanetPHPUnitAbstract.php
2014-02-11 09:02:29 +01:00
Nicolas Le Goff
aa914b4c13 Merge pull request #936 from romainneutron/fix-1693
[3.8] Fix #1693 : Guest users should be able to access detailed view
2014-02-11 08:45:04 +01:00
Nicolas Le Goff
6fd944973e Merge pull request #937 from romainneutron/fix-1690
Fix #1690 : Avoid tests failure because a second
2014-02-11 08:44:24 +01:00
Nicolas Le Goff
1e6367bb6e Merge pull request #938 from romainneutron/fix-1686
[3.8] Fix #1686 : Fix jquery ui usage
2014-02-11 08:43:48 +01:00
Nicolas Le Goff
c03dbad424 Merge pull request #939 from romainneutron/fix-1691
[3.8] Fix #1691 : Avoid exception message for users
2014-02-11 08:43:22 +01:00
Romain Neutron
66b3ad0022 Fix #1691 : Avoid exception message for users 2014-02-10 23:33:25 +01:00