hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-11 20:13:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,778 Commits 268 Branches 107 Tags
d7a68dbec36d2b90a0ff42b42c73df5aec8889f1
Commit Graph

1792 Commits

Author SHA1 Message Date
Romain Neutron
d7a68dbec3 Remove http_request 2013-11-12 19:39:22 +01:00
Romain Neutron
4963349ce3 Fix latest merge 2013-11-12 19:30:56 +01:00
Romain Neutron
432252f5f8 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Root/Account.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/User/Adapter.php
	lib/classes/eventsmanager/broker.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/uploadquarantine.php
	lib/classes/eventsmanager/notify/validationdone.php
	templates/web/admin/index.html.twig
 2013-11-12 19:19:13 +01:00
Romain Neutron
866a3e94e0 Fix events manager eroneous notification availability detection 2013-11-12 15:16:55 +01:00
Romain Neutron
bea211074b Fix #1571 : Cleanup user settings, fix user settings calls 2013-11-12 15:16:54 +01:00
Romain Neutron
cab32f870c Merge pull request #765 from nlegoff/reset_sys_admin_right 
[3.9] Add ACL manipulator && Refactor reset sys admin rights
 2013-11-11 01:45:55 -08:00
Romain Neutron
2072f9e0e0 Merge branch '3.8' 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php
 2013-11-08 19:04:26 +01:00
Nicolas Le Goff
4cef82083c Add ACL Manipulator 2013-11-08 17:51:14 +01:00
Romain Neutron
b5e944caf0 Fix #1579 : Update old geonames server address 2013-11-08 11:52:43 +01:00
Romain Neutron
f8411a604e Fix patch naming mess 2013-11-07 17:49:39 +01:00
Romain Neutron
95b0c24d4b Use semver for Phraseanet version numbers 2013-11-07 17:49:39 +01:00
Romain Neutron
f39af8b64e Merge branch '3.8' 2013-11-06 11:26:47 +01:00
Romain Neutron
3fbd4a7daa Merge pull request #734 from nlegoff/acl_service 
[3.9] Add ACL as a service
 2013-11-05 08:08:09 -08:00
Romain Neutron
f27fa53d4c Merge branch '3.8' 
Conflicts:
	.travis.yml
	templates/web/setup/wrapper.html.twig
	tests/Alchemy/Tests/Phrasea/Authentication/AuthenticatorTest.php
 2013-11-05 15:20:35 +01:00
Nicolas Le Goff
1fdf30c6af Use ACL service provider to get user's ACL 2013-11-05 12:21:42 +01:00
jygaulier
1f5e4da841 added tests for "phrasea_public_query" and "phrasea_highlight" in console/checkExtension 2013-11-04 19:36:29 +01:00
Romain Neutron
fdde1ebd8a Fix entities namespace 2013-11-04 11:56:30 +01:00
Romain Neutron
557cdcb4e5 Merge pull request #746 from nlegoff/fix1560 
[3.8] Fix #1560 Field edition for vocabulary is broken
 2013-11-04 00:56:34 -08:00
Nicolas Le Goff
409a43db0c Fix field edition for vocabulary 2013-10-31 17:56:47 +01:00
Romain Neutron
13dd86c67f Fix CS 2013-10-31 14:22:41 +01:00
Romain Neutron
e4386660df Remove unused exceptions 2013-10-31 14:18:06 +01:00
Romain Neutron
ea7523f1db Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Publications.php
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Lightbox.php
	lib/Alchemy/Phrasea/Controller/Permalink.php
	lib/Alchemy/Phrasea/Controller/Prod/Feed.php
	lib/Alchemy/Phrasea/Controller/Prod/Order.php
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/Share.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Controller/Setup.php
	lib/Alchemy/Phrasea/Core/CLIProvider/LessBuilderServiceProvider.php
	lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php
	lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/record/adapter.php
	lib/classes/task/Scheduler.php
	lib/classes/task/manager.php
	lib/classes/task/period/RecordMover.php
	lib/classes/task/period/archive.php
	lib/classes/task/period/cindexer.php
	lib/classes/task/period/ftp.php
	lib/classes/task/period/ftpPull.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.php
	tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
	tests/classes/PhraseanetPHPUnitAbstract.php
 2013-10-31 14:01:44 +01:00
Romain Neutron
9b471fdf76 Fix CS 2013-10-31 11:53:30 +01:00
Romain Neutron
36f7b24f26 Fix build 2013-10-30 10:57:19 +01:00
Romain Neutron
f3ea7e95dd Merge pull request #600 from romainneutron/task-manager 
[3.9] Task manager
 2013-10-29 11:51:22 -07:00
Romain Neutron
479663fd41 Merge pull request #728 from romainneutron/remove-sso 
[3.9] Remove sso
 2013-10-29 11:02:37 -07:00
Romain Neutron
5d2dd07caa Fix latest rebase 2013-10-29 18:56:01 +01:00
Romain Neutron
169b251968 Add persistence 2013-10-29 18:46:37 +01:00
Romain Neutron
3f6ce4991e Fix ORM patch 2013-10-29 18:46:36 +01:00
Romain Neutron
053de5df8b Address PR comments 2013-10-29 18:46:36 +01:00
Romain Neutron
3bf0f0ea87 Remove Tasks from table delete proposals 2013-10-29 18:46:35 +01:00
Romain Neutron
3f81474c4b Scheduler cleanup 2013-10-29 18:46:35 +01:00
Romain Neutron
afd9d33b9a Update task manager commands 2013-10-29 18:46:34 +01:00
Romain Neutron
58c402ac2b Update unit tests and legacy 2013-10-29 18:46:34 +01:00
Romain Neutron
12727e20a7 Bump to version a8 2013-10-29 18:42:47 +01:00
Romain Neutron
36cc33b05a Remove old files 2013-10-29 18:42:46 +01:00
Romain Neutron
68437a9310 Merge pull request #731 from romainneutron/doctrine-namespace 
[WIP][3.9] Move entities to Phrasea namespace
 2013-10-29 10:11:37 -07:00
Romain Neutron
072bd8f5fc Merge branch '3.8' 2013-10-29 17:44:26 +01:00
Romain Neutron
2e2bdb86e9 Remove system_url 2013-10-29 17:37:28 +01:00
Romain Neutron
08ce909730 Move doctrine repositories to Phrasea namespace 2013-10-29 17:30:11 +01:00
jygaulier
3b2b72d681 fix #1553 2013-10-29 17:11:22 +01:00
Romain Neutron
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01:00
Romain Neutron
4316c5411b Remove sso 2013-10-29 15:07:14 +01:00
Romain Neutron
972ab94944 Add missing patch for orders 2013-10-29 12:31:35 +01:00
Romain Neutron
09344f4703 Merge branch '3.8' 2013-10-29 10:32:10 +01:00
Romain Neutron
ebe4f00c6b Fix doctrine transaction in lazaret patch 2013-10-28 23:20:42 +01:00
Romain Neutron
96ac795d8d Merge branch '3.8' 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/classes/Feed/Entry/Item.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
 2013-10-28 18:21:15 +01:00
Nicolas Le Goff
b45bc31135 Adress comments 2013-10-28 15:53:00 +01:00
Romain Neutron
f12eae664f Merge pull request #725 from romainneutron/fix-1545 
[3.8] Sanitize XML data
 2013-10-28 05:42:01 -07:00
Nicolas Le Goff
297f23dc06 Addressed romainneutron comments 2013-10-28 12:57:05 +01:00