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

391 Commits

Author SHA1 Message Date
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
95b0c24d4b Use semver for Phraseanet version numbers 2013-11-07 17:49:39 +01:00
Romain Neutron
db4286c506 Merge pull request #754 from romainneutron/decouple-cache 
[3.9] Decouple Phraseanet cache factory and cache connection factory
 2013-11-05 08:08:56 -08:00
Romain Neutron
19462d160c Decouple Phraseanet cache factory and cache connection factory 2013-11-05 15:22:46 +01:00
Nicolas Le Goff
21eec6dbbe Add ACL Service 2013-11-05 12:21:42 +01:00
Romain Neutron
97988de0da Remove locale on request finish, not on kernel terminate 2013-11-04 13:29:16 +01:00
Romain Neutron
13dd86c67f Fix CS 2013-10-31 14:22:41 +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
38264a0ae7 Merge branch '3.8' 
Conflicts:
	bower.json
	lib/classes/task/manager.php
	lib/conf.d/minifyGroupsConfig.php
	tests/classes/PhraseanetPHPUnitAbstract.php
 2013-10-31 13:57:21 +01:00
Romain Neutron
9b471fdf76 Fix CS 2013-10-31 11:53:30 +01:00
Romain Neutron
9ee3e7c9f7 Move converters to model namespace 2013-10-30 13:06:14 +01:00
Romain Neutron
5f9c6391a2 Merge pull request #723 from nlegoff/fix1548 
[3.8] Fix #1548 Sets default field label selected according to user langage preference
 2013-10-29 11:03:34 -07:00
Romain Neutron
5d2dd07caa Fix latest rebase 2013-10-29 18:56:01 +01:00
Romain Neutron
7a7d558b38 Update tasks service provider 2013-10-29 18:46:35 +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
fa4d97f32b Add LogFileFactory to TasksServiceProvider 2013-10-29 18:41:43 +01:00
Romain Neutron
0827ba514c Add task manipulator 2013-10-29 18:41:43 +01:00
Romain Neutron
8046224858 Add Tasks and Converters service provider 2013-10-29 18:41:42 +01:00
Romain Neutron
3f16314783 Add TaskManager and SignalHandler CLI service providers 2013-10-29 18:41:42 +01:00
Romain Neutron
5c6bb2bd1f Merge branch '3.8' 2013-10-29 18:12:29 +01:00
Romain Neutron
0446dc29fc Add cache to configuration 2013-10-29 17:55:49 +01:00
Romain Neutron
19d45863b9 Move doctrine logger to Phrasea namespace 2013-10-29 17:35:34 +01:00
Romain Neutron
910850396c Move doctrine types to Phrasea namespace 2013-10-29 17:05:20 +01:00
Nicolas Le Goff
7a1595744f Fix tests 2013-10-29 17:02:14 +01:00
Romain Neutron
18251456e4 Move doctrine proxies to Phrasea namespace 2013-10-29 17:00:32 +01:00
Romain Neutron
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01:00
Nicolas Le Goff
7b256eae61 Fix setting cookie 2013-10-28 18:41:41 +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
Nicolas Le Goff
496b5145a7 Sets cookie in PhraseaLocaleSuscriber 2013-10-28 14:16:21 +01:00
Nicolas Le Goff
d5ff2f03e4 Rename ModelServiceProvider to ManipulatorServiceProvider 2013-10-28 12:57:05 +01:00
Nicolas Le Goff
23a5a1992e Fix tests 2013-10-28 12:57:05 +01:00
Nicolas Le Goff
297f23dc06 Addressed romainneutron comments 2013-10-28 12:57:05 +01:00
Nicolas Le Goff
1f03451bfc Add user manager & user manipulator 2013-10-28 12:57:04 +01:00
Nicolas Le Goff
c5c75ceb2f Registe plugin_asset twig function 2013-10-28 12:44:29 +01:00
Romain Neutron
eb590780ca Fix CS 2013-09-30 18:26:32 +02:00
Romain Neutron
9d3b21238c Prepare version 3.8 2013-09-25 21:42:27 +02:00
Romain Neutron
017000f1c8 Update version name 2013-09-14 02:10:59 +02:00
Romain Neutron
00d4c595ee Update version name 2013-09-14 02:04:04 +02:00
Andrey
8f63938149 Added migration patch 2013-09-05 13:44:14 +02:00
Andrey
c0bd291f7a Add Doctrine schema pre-upgrades 2013-09-05 13:44:14 +02:00
Andrey
c8b62c02db Rebased, fixed codestyle 2013-09-05 13:44:06 +02:00
Andrey
6bdfa2da29 Fixed RSSFeeds bug for php 5.3, fixed Aggregate->getEntries() called without any feed 2013-09-05 13:44:05 +02:00
Andrey
d303a383e6 Implement feed formatters, fixed tests and prod controllers 2013-09-05 13:44:02 +02:00
Andrey
affdfe7a0a Implement RSSFeeds, fixed controllers implementation, fixed tests 2013-09-05 13:44:02 +02:00
Andrey
f117817e87 Implementation of doctrine entities 2013-09-05 13:43:04 +02:00