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

501 Commits

Author SHA1 Message Date
Nicolas Le Goff
43a2e75c0f Fix tests 2013-11-05 15:33:01 +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
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
9b471fdf76 Fix CS 2013-10-31 11:53:30 +01:00
Romain Neutron
de05dcd113 Remove deprecated comments in prod controllers 2013-10-30 18:52:41 +01:00
Romain Neutron
1af022b84f Declare prod controllers as services, remove "call" methods 2013-10-30 18:47:40 +01:00
Romain Neutron
58c402ac2b Update unit tests and legacy 2013-10-29 18:46:34 +01:00
Romain Neutron
08ce909730 Move doctrine repositories to Phrasea namespace 2013-10-29 17:30:11 +01:00
Romain Neutron
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01: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
22b2dddcf8 Fix #1532 : Add checkbox on feed creation to disable email notifications 2013-10-22 11:09:29 +02:00
Romain Neutron
f7dfe893b4 Merge branch '3.8' 
Conflicts:
	bower.json
 2013-10-15 19:11:39 +02:00
Romain Neutron
eca23ce8c1 Merge pull request #688 from romainneutron/fix-1520 
[3.8] Fix #1520 : Avoid fatal error while editing from multiple databoxes
 2013-10-10 09:03:04 -07:00
Romain Neutron
5538a6924c Fix #1520 : Avoid fatal error while editing from multiple databoxes 2013-10-10 13:39:47 +02:00
Romain Neutron
f648ea296f Fix #1488 : Push / Feedback name is now mandatory 2013-10-10 13:39:07 +02:00
Romain Neutron
aa2b2c11c4 Merge branch '3.8' 2013-09-19 15:10:54 +02:00
Romain Neutron
fac302dcbd Fix #1479 : Add validation duration in mail body 2013-09-19 14:39:16 +02:00
Romain Neutron
0d3aaf362d Merge branch 'feeds-entities' of https://github.com/csaoh/Phraseanet 2013-09-12 13:53:56 +02:00
Romain Neutron
6c29fc88e9 Merge branch '3.8' 
Conflicts:
	composer.lock
	templates/mobile/common/index.html.twig
 2013-09-05 13:57:42 +02:00
Andrey
a5cdb65ed6 Removed loadwithuser method 2013-09-05 13:44:12 +02:00
Andrey
887af14a82 More camelcase 2013-09-05 13:44:11 +02:00
Andrey
c1910a188e Replaced underscores in variable names to make them camelcase 2013-09-05 13:44:10 +02:00
Andrey
42830efef5 Removed findbyuser methods 2013-09-05 13:44:10 +02:00
Andrey
06bf968e39 Fixed codestyle by removing extra assignments 2013-09-05 13:44:09 +02:00
Andrey
cedd924e31 Fixed codestyle 2013-09-05 13:44:08 +02:00
Andrey
7796c55ab7 Renamed and fixed entry update/delete bindings 2013-09-05 13:44:08 +02:00
Andrey
1764d5f5c4 Fixed order in entry/update, fixed a lot of codestyle 2013-09-05 13:44:06 +02:00
Andrey
c8b62c02db Rebased, fixed codestyle 2013-09-05 13:44:06 +02:00
Andrey
d8d9ab7607 Removed remaining occurrences to Feed_, adapted patch_320f 2013-09-05 13:44:05 +02:00
Andrey
289c0294b2 Rebased, fixed minor bugs 2013-09-05 13:44:04 +02:00
Andrey
dec41aeb4f Fixed codestyle 2013-09-05 13:44:03 +02:00
Andrey
bc5b69fae4 Fixed codestyle 2013-09-05 13:44:03 +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
Nicolas Le Goff
ce55141917 Fix #1445 Wording & issue while moving record from collections 2013-09-05 12:04:18 +02:00
Romain Neutron
4c90f168a7 Remove unused use statements 2013-09-04 14:25:01 +02:00
Romain Neutron
dbd06e9091 Remove dead code 2013-09-04 12:14:50 +02:00
Romain Neutron
c8d415c562 Merge branch '3.8' 2013-09-02 17:22:18 +02:00
Romain Neutron
3736510c72 Fix #1424 : Editing a story don't work 2013-09-02 13:57:22 +02:00
Nicolas Le Goff
862053396f Adressed @romainneutron 's comments 2013-09-02 12:12:37 +02:00
Nicolas Le Goff
5fbb2e83b2 Use temporary file system 2013-09-02 12:12:36 +02:00
Nicolas Le Goff
bdf491c426 Fix CS 2013-09-02 12:12:36 +02:00
Nicolas Le Goff
7e1fafc5bb Fix #1414 Add immediate thumbnail substitution after success download 2013-09-02 12:12:36 +02:00
Nicolas Le Goff
6a2fb618d3 Move substituion logger from class method to controllers 2013-09-02 12:12:36 +02:00
Romain Neutron
8b3e06ec4c Fix ftp connection test experience 2013-08-30 13:37:45 +02:00
Romain Neutron
ae28828f10 Fix order 2013-08-27 12:17:20 +02:00
Andrey
4e754d8d25 removed references to ssel_id 2013-08-27 11:59:27 +02:00
Andrey
6b4ac37fe1 Reverted unnecessary modification 2013-08-27 11:58:50 +02:00