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
9,528 Commits 268 Branches 107 Tags
3d16c624b44b4fa117becf5280cedd0d8f70b124
Commit Graph

146 Commits

Author SHA1 Message Date
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
6ab51d55f8 Add missing headers 2013-11-20 19:03:55 +01:00
Romain Neutron
051d9f4035 Remove license comments 2013-11-20 16:49:29 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
3548421160 Add basket converter 2013-11-13 17:52:12 +01:00
Romain Neutron
4963349ce3 Fix latest merge 2013-11-12 19:30:56 +01:00
Romain Neutron
432252f5f8 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Root/Account.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/User/Adapter.php
	lib/classes/eventsmanager/broker.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/uploadquarantine.php
	lib/classes/eventsmanager/notify/validationdone.php
	templates/web/admin/index.html.twig
 2013-11-12 19:19:13 +01:00
Romain Neutron
866a3e94e0 Fix events manager eroneous notification availability detection 2013-11-12 15:16:55 +01:00
Romain Neutron
bea211074b Fix #1571 : Cleanup user settings, fix user settings calls 2013-11-12 15:16:54 +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
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
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
Andrey
c732d4139a Fixed exception issues 2013-09-05 13:44:09 +02:00
Andrey
cedd924e31 Fixed codestyle 2013-09-05 13:44:08 +02:00
Andrey
84300f3c92 Replaced remaining occurrences of Feed_ classes, updated tests 2013-09-05 13:44:04 +02:00
Andrey
affdfe7a0a Implement RSSFeeds, fixed controllers implementation, fixed tests 2013-09-05 13:44:02 +02:00
Romain Neutron
dbd06e9091 Remove dead code 2013-09-04 12:14:50 +02:00
Andrey
ce6d1e028f Fixed some codestyle 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
Romain Neutron
6d30f9bc9d Fix validation reminder 2013-07-17 19:31:53 +02:00
Nicolas Le Goff
870c832fb5 Remove register_enable function from login class 2013-07-12 20:06:31 +02:00
Romain Neutron
5d53df2ea3 Fix #1296 : Some notification descriptions are wrong 2013-07-11 19:00:41 +02:00
Nicolas Le Goff
445444b7da Set missing user 2013-06-18 17:49:59 +02:00
Nicolas Le Goff
b237705bcd Set missing user 2013-06-18 17:49:59 +02:00
Romain Neutron
784e454311 Update emails notifications 2013-06-17 19:37:52 +02:00
Romain Neutron
4161ef2e31 Use url generator everywhere 2013-06-13 09:44:16 +02:00
Nicolas Le Goff
53cafa7117 Fix #1189 notifications display is broken 2013-05-30 18:59:59 +02:00
Romain Neutron
6537b96f4c Add AuthenticationServiceProvider 2013-05-29 14:22:50 +02:00
Romain Neutron
cf0f13d9c9 Add TokensServiceProvider 2013-04-30 18:44:35 +02:00
Romain Neutron
c184278b40 Fix doc blocks 2013-01-29 18:34:50 +01:00
Romain Neutron
4414892b91 Fix CS lib/classes 2013-01-29 16:39:02 +01:00
Romain Neutron
309a0a9472 Add better exception handling for emails 2013-01-29 11:32:43 +01:00
Romain Neutron
303c7e859a Remove unnecessary try catch blocks 2013-01-29 11:12:54 +01:00
Romain Neutron
aa18c48306 Fix unit tests 2013-01-29 09:34:20 +01:00
Romain Neutron
5184bfb495 Remove events availability customization 2013-01-29 09:34:19 +01:00
Romain Neutron
3dc0154f9a Update to fit latest Mail Interface 2013-01-29 09:34:19 +01:00
Romain Neutron
9cce7ab8f9 Update notifications 2013-01-29 09:34:18 +01:00
Romain Neutron
842ad40985 Bump copyright year 2013-01-21 23:28:58 +01:00
Romain Neutron
2069d40544 Use composer as application autoloader 2013-01-18 17:47:25 +01:00
Romain Neutron
3ac5e0c6c3 Fix reminders not saved in DB 2012-10-25 17:35:46 +02:00
Nicolas Le Goff
cde9ce18ae Add prod refactor 
Fix issue

Conflicts:

	lib/Alchemy/Phrasea/Controller/Prod/Share.php
	lib/Alchemy/Phrasea/Controller/User/Notifications.php
	lib/Alchemy/Phrasea/Controller/User/Preferences.php
	templates/web/common/dialog_export.html.twig
 2012-10-18 15:45:50 +02:00
Nicolas Le Goff
698bd75554 Fix disorder betwwen variables name 2012-10-18 15:45:49 +02:00
Romain Neutron
0565bce475 Remove user variable assignment 2012-10-04 15:44:49 +02:00
Romain Neutron
1700565862 Cleanup namepaces, variables uses 2012-10-04 15:44:49 +02:00
Romain Neutron
58af2b4c9c Remove get_registry method 2012-10-04 15:44:49 +02:00