hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,269 Commits 268 Branches 107 Tags
903f63cd32e91343676dc39f33c3fb26b4ba76e4
Commit Graph

2368 Commits

Author SHA1 Message Date
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
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
9aa4e7abd8 Fix #1680 : Add support for custom extension to mime-type mapping 2014-02-13 16:22:41 +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
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
b819de9a54 Rename xliff files to xlf 2014-02-12 19:58:51 +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
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
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
Romain Neutron
68e775dfd3 Fix #1693 : Guest users should be able to access detailed view 2014-02-10 14:08:01 +01:00
Romain Neutron
8cdd19bcf7 Fix #1689 : Discard wrong XML errors 2014-02-10 12:15:17 +01:00
Nicolas Le Goff
c4eadb7e0e Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Controller/Lightbox.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Controller/Prod/TOU.php
	lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Security/Firewall.php
	lib/classes/task/abstract.php
	tests/Alchemy/Tests/Phrasea/Security/FirewallTest.php
 2014-02-05 19:42:22 +01:00
Nicolas Le Goff
863975d7ca Merge pull request #925 from romainneutron/avoid-exception-driven-logic 
[3.8] Avoid exception driven logic
 2014-02-05 19:30:11 +01:00
Nicolas Le Goff
be5553936c Merge pull request #929 from romainneutron/geonames-server-log 
[3.8] Update geonames server dependency for better logs
 2014-02-05 19:29:46 +01:00
Romain Neutron
b9e4c599b2 Avoid exception driven logic 2014-02-05 16:43:49 +01:00
Romain Neutron
a2e7918b63 Update geonames server dependency for better logs 2014-02-05 16:41:15 +01:00
Nicolas Le Goff
3b9b5a3240 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
 2014-02-05 15:25:52 +01:00
Romain Neutron
7406aa8fc2 Remove SearchEngineInterface::clearAllCache, keep last hour phrasea cache 2014-02-05 13:11:30 +01:00
Nicolas Le Goff
04bb823a8b Fix lastest merge 2014-02-05 11:25:41 +01:00
Nicolas Le Goff
99244ca624 Fix latest merge 2014-02-04 20:41:22 +01:00
Nicolas Le Goff
4cae02aed3 Merge branch '3.8' 
Conflicts:
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
 2014-02-04 17:25:40 +01:00
Nicolas Le Goff
beceb9350b Merge pull request #921 from romainneutron/fix-1682 
Fix #1682 : Add OPTIONS HTTP method over permalinks for Office AddIn media discovery
 2014-02-04 08:22:18 -08:00
Romain Neutron
72344662d4 Fix #1682 : Add OPTIONS HTTP method over permalinks for Office AddIn media discovery 2014-02-04 14:02:56 +01:00
Nicolas Le Goff
4596bf5d30 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Security/Firewall.php
 2014-02-04 11:30:23 +01:00
Nicolas Le Goff
8f9745d874 Merge branch '3.8' 
Conflicts:
	lib/classes/task/Scheduler.php
	lib/classes/task/abstract.php
	templates/web/client/index.html.twig
 2014-02-04 11:25:59 +01:00
Romain Neutron
ef781c43c8 Avoid exception driven filters 2014-02-03 22:00:29 +01:00
Nicolas Le Goff
2c42f7e3dc Merge pull request #915 from romainneutron/error-logs 
[3.8] Error logs
 2014-02-03 10:47:09 -08:00
Nicolas Le Goff
095c9eb72f Merge branch '3.8' 
Conflicts:
	lib/classes/task/period/RecordMover.php
 2014-02-03 19:13:45 +01:00
Nicolas Le Goff
bd1e4516bd Merge branch '3.8' 
Conflicts:
	config/configuration.sample.yml
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/conf.d/configuration.yml
	templates/mobile/common/index.html.twig
 2014-02-03 19:02:22 +01:00
Nicolas Le Goff
fc1bec4816 Merge pull request #912 from romainneutron/fix-1661 
[3.8] Fix #1661 : Use bin/setup for plugin manipulation to avoid plugin failures
 2014-02-03 09:25:39 -08:00
Nicolas Le Goff
938a832a49 Merge pull request #911 from romainneutron/fix-1663 
[3.8] Fix #1663 : Remove plugin configuration on uninstall
 2014-02-03 09:24:16 -08:00
Nicolas Le Goff
80630d6978 Merge pull request #910 from romainneutron/fix-1662 
[3.8] Fix #1662 : Abort plugin uninstall in case the plugin is not present
 2014-02-03 09:21:37 -08:00
Nicolas Le Goff
372b70bc8f Merge pull request #907 from romainneutron/logs-configuration 
[3.8] Logs configuration
 2014-02-03 09:20:27 -08:00
Romain Neutron
a66f158dbb Fix #1661 : Use bin/setup for plugin manipulation to avoid plugin failures 2014-02-03 17:24:57 +01:00
Romain Neutron
cb82e6047d Enhance error messages 2014-02-03 16:36:43 +01:00
Romain Neutron
5a8d60ab86 Pimp error message 2014-02-03 16:16:53 +01:00
Romain Neutron
0085b15304 Fix #1663 : Remove plugin configuration on uninstall 2014-02-03 14:00:33 +01:00
Romain Neutron
b2af24954c Fix #1662 : Abort plugin uninstall in case the plugin is not present 2014-02-03 13:52:38 +01:00
Romain Neutron
7e7350a0a7 Bump to version 3.8.3-alpha.5 2014-01-31 15:09:05 +01:00
Nicolas Le Goff
30078730ab Merge branch '3.8' 
Conflicts:
	bin/console
	composer.lock
 2014-01-31 14:59:53 +01:00