493 Commits

Author	SHA1	Message	Date
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
Andrey	ddf58d0ddb	Fixed small typo in records	2013-08-27 11:58:50 +02:00
Andrey	4dd60362c5	More fixes for the PR	2013-08-27 11:58:49 +02:00
Andrey	9b85b105d8	Fixed PR comments	2013-08-27 11:58:48 +02:00
Andrey	53ee289b9b	Renamed Orders into Order	2013-08-27 11:58:48 +02:00
Andrey	71f77bff0f	Fixed minor error in orders	2013-08-27 11:58:48 +02:00
Andrey	17a1ab9def	Fixed codestyle (removed extra lines)	2013-08-27 11:58:45 +02:00
Andrey	ea1364a499	Added forgotten files, fixed codestyle a little bit	2013-08-27 11:58:45 +02:00
Andrey	32c6ceccd4	Replaced exceptions	2013-08-27 11:58:45 +02:00