hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,599 Commits 268 Branches 107 Tags
76d0cef9b58cf9d1ecc87ce01aa92b61b8d392aa
Commit Graph

118 Commits

Author SHA1 Message Date
Romain Neutron
66e762a1d1 Fix unit test names 2013-12-10 01:29:02 +01:00
Romain Neutron
a3b1ae7163 Fix unit test names, property and function visibility 2013-12-10 01:29:02 +01:00
Romain Neutron
a94f9a2f15 App loading optimisation + unit tests to PHP 5.4 2013-12-05 19:08:34 +01:00
Romain Neutron
e9e9d149a1 Locale simplification 2013-12-03 20:05:20 +01:00
Romain Neutron
4f31cfeefc Merge branch '3.8' 
Conflicts:
	bower.json
	templates/web/common/index_bootstrap.html.twig
	templates/web/common/menubar.html.twig
	templates/web/login/layout/base-layout.html.twig
	templates/web/prod/Baskets/Reorder.html.twig
 2013-12-02 18:17:38 +01:00
Romain Neutron
94d547d897 Fix #1593 : "download" query parameter is not working anymore on permalink URIs 2013-11-28 11:49:19 +01:00
Romain Neutron
7e0a3c7338 Use configuration property accessor 2013-11-18 18:48:27 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
13915dc1a8 Rename "phraseanet.configuration" service to "configuration" 2013-11-15 22:08:07 +01:00
Nicolas Le Goff
1fdf30c6af Use ACL service provider to get user's ACL 2013-11-05 12:21:42 +01:00
Romain Neutron
b90662bc0a Fix entities namespace 2013-11-04 12:39:30 +01:00
Romain Neutron
f11bf65c35 Fix entities namespace 2013-11-04 11:26:52 +01:00
Romain Neutron
1c27778001 Merge branch '3.8' 
Conflicts:
	tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
 2013-10-31 17:56:48 +01:00
Romain Neutron
664339e3ec Merge pull request #742 from romainneutron/fix-1555 
Fix #1555 : API sessions remain open
 2013-10-31 08:35:00 -07:00
Romain Neutron
24a6dce598 Fix #1555 : API sessions remains open 2013-10-31 15:19:24 +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
5d2dd07caa Fix latest rebase 2013-10-29 18:56:01 +01:00
Romain Neutron
58c402ac2b Update unit tests and legacy 2013-10-29 18:46:34 +01:00
Romain Neutron
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01:00
Romain Neutron
fafe2dca0f Fix latest merge 2013-10-25 13:47:35 +02:00
Romain Neutron
762f758705 Merge branch '3.8' 
Conflicts:
	bower.json
	lib/Alchemy/Phrasea/Controller/Prod/Feed.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/eventsmanager/notify/feed.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
 2013-10-24 14:05:04 +02:00
Romain Neutron
3633c1a926 Fix #1531 : Allow preview access on public feed entry items 2013-10-22 12:44:14 +02:00
Romain Neutron
f7dfe893b4 Merge branch '3.8' 
Conflicts:
	bower.json
 2013-10-15 19:11:39 +02:00
Romain Neutron
e87aa5afb3 Fix #1524 : API search query is discarded with GET method 2013-10-10 13:39:59 +02:00
Andrey
578eab4901 Replaced record_24 with record_1 2013-09-05 13:44:08 +02:00
Andrey
85aa5959bd Fixed minor mapping errors 
Fixed mapping error in FeedItem

Fixed merging error
 2013-09-05 13:44:07 +02:00
Andrey
289c0294b2 Rebased, fixed minor bugs 2013-09-05 13:44:04 +02:00
Andrey
84300f3c92 Replaced remaining occurrences of Feed_ classes, updated tests 2013-09-05 13:44:04 +02:00
Romain Neutron
6802ca5288 Fix console application 2013-07-16 16:25:56 +02:00
Romain Neutron
f64d662a9d Add console APIs tests 2013-07-11 11:59:36 +02:00
Romain Neutron
435b4b1644 Link header should provide fully qualified URIs 2013-07-10 15:56:20 +02:00
Romain Neutron
2307a0b038 Replace old files with new ones 2013-06-28 18:49:47 +02:00
Romain Neutron
42db38d055 Add error pages, fix error handling and PHP conf 2013-06-17 17:01:35 +02:00
Romain Neutron
906d4ba9c5 Localize status bits 2013-06-14 09:47:54 +02:00
Romain Neutron
a7c4739797 Merge pull request #393 from romainneutron/collection-labels-api 
[3.8] Add collection labels to api
 2013-06-14 00:44:51 -07:00
Romain Neutron
f9b4978569 Merge pull request #390 from romainneutron/databox-labels 
[3.8] Add labels to databoxes
 2013-06-13 07:41:05 -07:00
Romain Neutron
d2a50f31b0 Add collection labels to api 2013-06-13 16:15:38 +02:00
Romain Neutron
11a55bbd43 Add labels to databoxes 2013-06-13 09:45:43 +02:00
Romain Neutron
4161ef2e31 Use url generator everywhere 2013-06-13 09:44:16 +02:00
Romain Neutron
cfbf2d27a0 Fix assertion 2013-06-11 21:47:00 +02:00
Romain Neutron
82af1ba69e Add localized labels to databox fields 2013-05-30 18:12:31 +02:00
Romain Neutron
278eb3c2dc Fix CS 2013-05-29 21:23:36 +02:00
Romain Neutron
5144743d33 Fix unit tests 2013-05-29 14:23:25 +02:00
Romain Neutron
2ec765a9e9 Fix unit tests 2013-05-29 14:23:24 +02:00
Romain Neutron
199f64e679 Update authentication events unit tests 2013-05-29 14:23:23 +02:00
Romain Neutron
760efe09cb Add OAuth2 events 2013-05-29 14:23:22 +02:00
Romain Neutron
e42363acb0 Add API auth events 2013-05-29 14:23:22 +02:00
Romain Neutron
d6ae31a2d0 Fix Overview unit test 2013-05-29 14:23:18 +02:00
Romain Neutron
8562100d7f Fix unit tests 2013-05-29 14:23:04 +02:00