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
9,042 Commits 268 Branches 107 Tags
d9b1a54e5589bf94c0577a48acedff86dba2eacf
Commit Graph

70 Commits

Author SHA1 Message Date
Benoît Burnichon
feddae6ac7 UserController refactor 2015-04-01 10:23:05 +02:00
Benoît Burnichon
054195d3c0 Finish Lightbox Controller 2015-03-30 14:41:15 +02:00
Benoît Burnichon
bcf59c560d Partial LightboxController refactor 2015-03-27 19:13:07 +01:00
Benoît Burnichon
b44fb7ed76 Typehint collection in RegistrationRepository 2015-03-12 15:08:24 +01:00
Benoît Burnichon
6d7c086ad7 Improve LazaretFileRepository by using query builder 2015-03-12 15:08:24 +01:00
Nicolas Le Goff
9a3e92ed9c Multiple ORMs for all database 2015-02-12 17:58:45 +01:00
Nicolas Le Goff
065f64bd47 Report previous patches 2015-02-09 13:42:26 +01:00
Nicolas Le Goff
b2dad6c18a Fix SQL queries 2015-02-06 17:01:49 +01:00
Nicolas Le Goff
088b0672cb Fix latest merge 2014-12-15 11:40:30 +01:00
Nicolas Le Goff
66fa05f4ee Fix CS 2014-07-17 15:17:04 +02:00
Nicolas Le Goff
1970439edb Fix latest merge 2014-06-24 16:40:12 +02:00
Nicolas Le Goff
0d040519f3 Add third party application webhook event 2014-06-23 17:48:42 +02:00
Nicolas Le Goff
b92370cca2 Merge pull request #1021 from nlegoff/api-doctrine 
[READY][3.9] Transform api_* tables to doctrine entities
 2014-06-13 14:13:23 +02:00
Nicolas Le Goff
1054483ae9 Fix latest merge 2014-03-30 21:17:46 +02:00
Nicolas Le Goff
178da6a3a6 Fix tests 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
63b6de5fc8 Remove one to one relation beetween account and token & add lastUsed field for token 2014-03-24 12:29:37 +01:00
Nicolas Le Goff
0cd4bb6e6a Fix DQL 2014-03-24 12:28:19 +01:00
Nicolas Le Goff
0591976fe7 Fix missing namespace 2014-03-24 12:28:19 +01:00
Nicolas Le Goff
b75d331a05 Add findByUserAndApplication method 2014-03-24 12:28:16 +01:00
Nicolas Le Goff
a11aa87d0a Return null if application is not found instead of throwing an exception 2014-03-24 12:28:16 +01:00
Nicolas Le Goff
c065340046 Add ApiOauthRefreshToken Repository 2014-03-24 12:28:15 +01:00
Nicolas Le Goff
d6a5a79229 Add some OauthCode repository functions 2014-03-24 12:28:15 +01:00
Nicolas Le Goff
bbbc8f7e02 Add some application repository function 2014-03-24 12:28:15 +01:00
Nicolas Le Goff
5d3cba6ce5 Add oauth repositories 2014-03-24 12:28:14 +01:00
Nicolas Le Goff
e317f86c51 Fix CS 2014-03-23 23:07:01 +01:00
Nicolas Le Goff
4af7dbddb1 Transform thesaurus preset into doctrine Entity 2014-03-06 01:31:43 +01:00
Romain Neutron
8b6cb53a36 Add token entities 2014-03-05 15:27:43 +01:00
Romain Neutron
b271c4ed9a Add missing proxy and repository 2014-03-01 14:46:22 +01:00
Nicolas Le Goff
241c31a26b Merge pull request #987 from romainneutron/users-wording 
[3.9] Fix users modelOf and lastModel wording
 2014-02-28 12:56:05 +01:00
Romain Neutron
9536aacab7 Fix users modelOf and lastModel wording 2014-02-28 03:03:53 +01:00
Nicolas Le Goff
256a68dc76 Merge pull request #992 from nlegoff/fix-repo 
[3.9] Fix some issues in repos
 2014-02-28 00:31:45 +01:00
Nicolas Le Goff
d0f8250509 Fix Typo in UserNotificationSettingRepository class name 2014-02-27 19:10:44 +01:00
Nicolas Le Goff
29c8624155 Fix usersetting repo 2014-02-27 19:10:25 +01:00
Romain Neutron
9a2875f46b Fix registration table name 2014-02-27 16:57:31 +01:00
Nicolas Le Goff
2ec4ffdbcc Refactor && Typo && Use plain objects as function parameters instead of ids 2014-02-26 12:10:54 +01:00
Nicolas Le Goff
52f3baac05 Fix neutron's comment 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
75fac19e73 Migrate demand table to doctrine entity && refactor registration API 2014-02-26 12:06:34 +01:00
Romain Neutron
4c29ea5a7a Merge branch 'replace_users' of https://github.com/nlegoff/Phraseanet into nlegoff-replace_users 
Conflicts:
	lib/classes/ACL.php
	lib/classes/User/Adapter.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/orderdeliver.php
	lib/classes/eventsmanager/notify/ordernotdelivered.php
	lib/classes/eventsmanager/notify/push.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/validate.php
	lib/classes/eventsmanager/notify/validationdone.php
	lib/classes/eventsmanager/notify/validationreminder.php
	lib/classes/module/report/add.php
	lib/classes/module/report/edit.php
	lib/classes/module/report/push.php
	lib/classes/module/report/sent.php
	lib/classes/module/report/validate.php
	lib/classes/record/preview.php
 2014-02-20 18:02:27 +01:00
Romain Neutron
e20c915775 Avoid using getPartialReference 2014-02-20 16:14:01 +01:00
Romain Neutron
12f9575a8b Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
	lib/classes/API/OAuth2/Adapter.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Adapter.php
	lib/classes/Feed/Collection.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/Feed/Publisher/Adapter.php
	lib/classes/User/Adapter.php
	lib/classes/base.php
	lib/classes/connection.php
	lib/classes/databox/cgu.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/bridgeuploadfail.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/orderdeliver.php
	lib/classes/eventsmanager/notify/ordernotdelivered.php
	lib/classes/eventsmanager/notify/push.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/validate.php
	lib/classes/eventsmanager/notify/validationdone.php
	lib/classes/eventsmanager/notify/validationreminder.php
	lib/classes/module/console/taskState.php
	lib/classes/module/console/taskrun.php
	lib/classes/record/adapter.php
	lib/classes/registry.php
	lib/classes/set/order.php
	lib/classes/task/abstract.php
	lib/classes/task/appboxAbstract.php
	lib/classes/task/databoxAbstract.php
	lib/classes/task/manager.php
	lib/classes/task/period/RecordMover.php
	lib/classes/task/period/apibridge.php
	lib/classes/task/period/archive.php
	lib/classes/task/period/ftp.php
	lib/classes/task/period/ftpPull.php
	templates/web/prod/upload/lazaret.html.twig
 2014-02-20 16:05:23 +01:00
Romain Neutron
25073721c8 Fix unit tests 2014-02-20 13:08:56 +01:00
Nicolas Le Goff
ba464ad497 Fix CS 2014-02-19 17:29:27 +01:00
Nicolas Le Goff
7fb44d2b43 Fix merge 2014-02-19 17:29:27 +01:00
Nicolas Le Goff
eaa1feb765 Address PR comments 2014-02-19 17:29:27 +01:00
Nicolas Le Goff
7c0d1e3d8d Fix user migration 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
c10c78f740 Fix unit tests 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
3b0fe2eb75 Fix CS 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
b341495c88 Fix tests 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
ed4ae71819 Fix test suite 2014-02-19 17:29:25 +01:00
Nicolas Le Goff
53ae0ccc24 Remove User_Adapter Inteface References 2014-02-19 17:29:25 +01:00