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

61 Commits

Author SHA1 Message Date
Nicolas Le Goff
e317f86c51 Fix CS 2014-03-23 23:07:01 +01:00
Romain Neutron
8b6cb53a36 Add token entities 2014-03-05 15:27:43 +01:00
Romain Neutron
8f87e8b1c8 Add user repository as a service 2014-02-28 19:58:12 +01:00
Nicolas Le Goff
2ec4ffdbcc Refactor && Typo && Use plain objects as function parameters instead of ids 2014-02-26 12:10:54 +01:00
Nicolas Le Goff
c98fe4c23d Adressed Neutron's comments 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
4946e35516 Fix tests, CS && typo 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
52f3baac05 Fix neutron's comment 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
75fac19e73 Migrate demand table to doctrine entity && refactor registration API 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
2028871f34 Fix Cs 2014-02-25 16:33:43 +01:00
Romain Neutron
862fe696cb Remove some circular references 2014-02-20 20:09:14 +01:00
Romain Neutron
25073721c8 Fix unit tests 2014-02-20 13:08:56 +01:00
Nicolas Le Goff
7fb44d2b43 Fix merge 2014-02-19 17:29:27 +01:00
Nicolas Le Goff
c156f842c7 Remove User_Adapter 2014-02-19 17:28:53 +01:00
Romain Neutron
d7f7e1c92c Fix CS 2014-01-14 12:04:38 +01:00
Romain Neutron
354232f61a Bump copyright year 2014-01-06 15:40:56 +01:00
Romain Neutron
e233e5afa6 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
	lib/classes/Exception/Feed/ItemNotFound.php
	lib/classes/Exception/Feed/PublisherNotFound.php
	lib/classes/Feed/Abstract.php
	lib/classes/Feed/Adapter.php
	lib/classes/Feed/Aggregate.php
	lib/classes/Feed/Collection.php
	lib/classes/Feed/CollectionInterface.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Collection.php
	lib/classes/Feed/Entry/Interface.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/Feed/Entry/ItemInterface.php
	lib/classes/Feed/Interface.php
	lib/classes/Feed/Link.php
	lib/classes/Feed/LinkInterface.php
	lib/classes/Feed/Publisher/Adapter.php
	lib/classes/Feed/Publisher/Interface.php
	lib/classes/Feed/Token.php
	lib/classes/Feed/TokenAggregate.php
	lib/classes/Feed/XML/Abstract.php
	lib/classes/Feed/XML/Atom.php
	lib/classes/Feed/XML/Cooliris.php
	lib/classes/Feed/XML/Interface.php
	lib/classes/Feed/XML/RSS.php
	lib/classes/Feed/XML/RSS/ImageInterface.php
	lib/classes/http/request.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/schedulerState.php
	lib/classes/module/console/schedulerStop.php
	lib/classes/module/console/taskState.php
	lib/classes/module/console/tasklist.php
	lib/classes/module/console/taskrun.php
	lib/classes/registry.php
	lib/classes/registryInterface.php
	lib/classes/set/order.php
	lib/classes/system/url.php
	lib/classes/task/Scheduler.php
	lib/classes/task/appboxAbstract.php
	lib/classes/task/databoxAbstract.php
	lib/classes/task/manager.php
	lib/classes/task/period/RecordMover.php
	lib/classes/task/period/apibridge.php
	lib/classes/task/period/archive.php
	lib/classes/task/period/cindexer.php
	lib/classes/task/period/emptyColl.php
	lib/classes/task/period/ftp.php
	lib/classes/task/period/ftpPull.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/test.php
	lib/classes/task/period/writemeta.php
	lib/conf.d/PhraseaFixture/AbstractWZ.php
	lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
	lib/conf.d/PhraseaFixture/Basket/LoadOneBasket.php
	lib/conf.d/PhraseaFixture/Basket/LoadOneBasketEnv.php
	lib/conf.d/PhraseaFixture/Lazaret/LoadOneFile.php
	lib/conf.d/PhraseaFixture/Story/LoadOneStory.php
	lib/conf.d/PhraseaFixture/UsrLists/ListAbstract.php
	lib/conf.d/PhraseaFixture/UsrLists/UsrList.php
	lib/conf.d/PhraseaFixture/UsrLists/UsrListEntry.php
	lib/conf.d/PhraseaFixture/UsrLists/UsrListOwner.php
	lib/conf.d/PhraseaFixture/ValidationParticipant/LoadOneParticipant.php
	lib/conf.d/PhraseaFixture/ValidationParticipant/LoadParticipantWithSession.php
	lib/conf.d/PhraseaFixture/ValidationSession/LoadOneValidationSession.php
 2014-01-06 15:38:14 +01:00
Romain Neutron
d519c13e56 Bump copyright year 2014-01-06 15:28:12 +01:00
Romain Neutron
64456a8964 Remove phraseanet registry 2013-12-20 16:44:22 +01:00
Romain Neutron
af807431b1 Add configuration form types 2013-12-20 11:43:41 +01:00
Romain Neutron
680643c0fc Fix unit tests and arrays declaration 2013-12-03 20:06:49 +01:00
Romain Neutron
2ba164701d Use symfony translator 2013-12-03 20:02:40 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
dca6667052 Merge branch '3.8' 2013-11-13 17:07:45 +01:00
Nicolas Le Goff
7c36829f11 Fix #1570 Remove accept tou link if there are no TOU 2013-11-12 19:59:54 +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
5d2dd07caa Fix latest rebase 2013-10-29 18:56:01 +01:00
Romain Neutron
4f24623961 Add TaskForm 2013-10-29 18:41:42 +01:00
Nicolas Le Goff
9f6389dac8 Fix auto collection selection 2013-10-29 15:18:41 +01:00
Nicolas Le Goff
241c60b986 Fix typo issue 2013-10-29 15:14:40 +01:00
Romain Neutron
dbd06e9091 Remove dead code 2013-09-04 12:14:50 +02:00
Romain Neutron
cdd1a21c71 Fix #1302 : redirect mechanism does not work as expected 2013-07-17 14:35:39 +02:00
Romain Neutron
a458e0854c Revert auto select db feature 2013-07-10 19:45:19 +02:00
Romain Neutron
89b53e50d2 Merge pull request #453 from nlegoff/bug_check 
[3.8] Fix some bugs
 2013-07-02 10:38:47 -07:00
Nicolas Le Goff
1b5e8c326b Fix inscription issue 2013-07-02 17:59:38 +02:00
Romain Neutron
8ca7aa4fac Add geoname validation constraint 2013-07-02 17:20:26 +02:00
Romain Neutron
3f47cc248d Remove registry's GV_RootPath calls 2013-06-19 19:25:16 +02:00
Romain Neutron
ca519612c6 Merge pull request #415 from romainneutron/locale 
[3.8] Update locales
 2013-06-18 06:33:20 -07:00
Romain Neutron
4fb39ff503 Update locales 2013-06-17 23:33:01 +02:00
Romain Neutron
42db38d055 Add error pages, fix error handling and PHP conf 2013-06-17 17:01:35 +02:00
Romain Neutron
c061191334 Fix CS 2013-06-17 15:09:23 +02:00
Nicolas Le Goff
7d0643150f Enhance wording && multiselect css component 
Fix typo
 2013-06-13 14:05:33 +02:00
Nicolas Le Goff
f30bca91a9 Adressed PR comment's 
Fix tests

Add dot at end of senetences

Fix typo
 2013-06-13 14:05:33 +02:00
Nicolas Le Goff
6d55d4c61c Fix #1141 Use form type repeated 2013-06-13 14:05:08 +02:00
Nicolas Le Goff
e89c502259 Enhance register classic collection multiselect 2013-06-13 14:03:55 +02:00
Romain Neutron
5b33f0f5b9 Update to latest auth-providers API 2013-05-29 14:23:26 +02:00
Romain Neutron
27c87ca7a7 Remove comments 2013-05-29 14:23:21 +02:00
Romain Neutron
a000c240cc Add updated Account and Login controllers 2013-05-29 14:23:19 +02:00
Romain Neutron
bb995bf324 Add NewLogin constraint 2013-05-29 14:23:19 +02:00
Romain Neutron
993b219cc1 Fix PasswordToken constraint 2013-05-29 14:23:18 +02:00
Romain Neutron
444684d5b4 Add missing message properties 2013-05-29 14:23:18 +02:00