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

67 Commits

Author SHA1 Message Date
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
a2899f6934 Insight recommendations 2013-11-12 17:58:03 +01:00
Romain Neutron
bea211074b Fix #1571 : Cleanup user settings, fix user settings calls 2013-11-12 15:16:54 +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
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01: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
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
Nicolas Le Goff
41bbd13f7d Fix #1432 User settings for notifications are not saved in 2013-09-03 18:03:43 +02:00
Nicolas Le Goff
ac5a929b3f Update SQLite database reference 2013-08-23 15:36:02 +02:00
Nicolas Le Goff
6a8312ca64 Add FtpCredentials entity 2013-08-23 12:09:50 +02:00
Nicolas Le Goff
a6a9a93b05 remove call to app in templates 2013-07-12 20:09:51 +02:00
Romain Neutron
4720a46b66 Update geoname server service provider 2013-07-02 15:04:33 +02:00
Romain Neutron
3f47cc248d Remove registry's GV_RootPath calls 2013-06-19 19:25:16 +02:00
Romain Neutron
42db38d055 Add error pages, fix error handling and PHP conf 2013-06-17 17:01:35 +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
325d54006a Fix AccountForm validation & Add repeated form 2013-06-13 14:05:09 +02:00
Romain Neutron
4161ef2e31 Use url generator everywhere 2013-06-13 09:44:16 +02:00
Romain Neutron
a000c240cc Add updated Account and Login controllers 2013-05-29 14:23:19 +02:00
Romain Neutron
f6e1f95669 Fix account tests 2013-05-29 14:23:18 +02:00
Romain Neutron
b8b0cec39c Add old password to password renewal form 2013-05-29 14:23:12 +02:00
Romain Neutron
a523261a73 Update authentication 2013-05-29 14:22:51 +02:00
Romain Neutron
cf0f13d9c9 Add TokensServiceProvider 2013-04-30 18:44:35 +02:00
Romain Neutron
74ce48fe45 Fix unit tests 2013-01-29 19:35:51 +01:00
Romain Neutron
c184278b40 Fix doc blocks 2013-01-29 18:34:50 +01:00
Romain Neutron
53206af159 Fix CS lib/Alchemy 2013-01-29 16:38:00 +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
9cce7ab8f9 Update notifications 2013-01-29 09:34:18 +01:00
Romain Neutron
b5980ab866 First implementation 2013-01-29 09:34:18 +01:00
Romain Neutron
842ad40985 Bump copyright year 2013-01-21 23:28:58 +01:00
Romain Neutron
13b67dfe37 Update Firewall API 2012-10-04 15:44:53 +02:00
Romain Neutron
c3b89aa1e4 Remove eventsmanager variable assignment 2012-10-04 15:44: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
75d6ce4982 Cleanup controllers 2012-10-04 15:44:48 +02:00
Romain Neutron
abc4d81521 Update controllers 2012-10-04 15:42:54 +02:00
Romain Neutron
ba3ea5d948 Update root controllers 2012-10-04 15:31:37 +02:00
Romain Neutron
7a11b3266b Fix reset password routes 2012-08-29 14:46:09 +02:00
Romain Neutron
f4fd69504f Remove unused routes 2012-08-29 13:59:22 +02:00
Romain Neutron
0f7056dfed Normalize request calls 2012-08-23 14:15:21 +02:00
Nicolas Le Goff
367cf7c2a4 add /login/authenticate/ 
remove  login/authenticate controller

add generateEmail function

move parent::tearDownAfterClass at the end od the function

use twitter bootstrap alert component

Update doc blocks & fix issues

add XMLHTTPRequest to PhraseanetPHPUNIt framework

fix tests

remove var_dump

refactor postlog process

fix URI's

fix redirection URI
 2012-08-21 17:32:00 +02:00
Nicolas Le Goff
9419c7e589 add /account/* tests 2012-08-21 17:31:59 +02:00
Romain Neutron
9f11445265 Namespaces cleanup 2012-07-27 12:26:12 +02:00
Romain Neutron
68ef531258 Remove inline JsonResponse instanciation 2012-07-24 19:52:08 +02:00
Romain Neutron
2a4a3f3ec8 Enable Twig service provider 2012-07-24 13:11:26 +02:00
Nicolas Le Goff
cfe5e4a752 rename route anme post_* to submit_* & revert password lenght control 2012-07-20 18:13:35 +02:00
Nicolas Le Goff
fdec06c1e1 add /login/register/ 2012-07-20 17:36:25 +02:00