hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 10:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,363 Commits 268 Branches 107 Tags
5f6e1412d024af0ac4524b26cd400ff4c00bd53c
Commit Graph

7363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benoît Burnichon
5f6e1412d0 Add alchemy/symfony-cors to ease CORS header generation 
Update CORS configuration.
 2015-10-12 10:30:01 +02:00
jygaulier
2fddc3fd96 Merge pull request #1531 from jygaulier/PHRAS-750_ftp-proxy-auth 
#PHRAS-750 #time 10m
 2015-10-07 18:49:42 +02:00
Jean-Yves Gaulier
7d5b779ae6 #PHRAS-750 #time 10m 
fix in ftp task
 2015-10-07 18:48:05 +02:00
jygaulier
741bb26980 Merge pull request #1527 from jygaulier/PHRAS-750_ftp-proxy-auth 
#PHRAS-750 #time 20m
 2015-10-07 16:24:10 +02:00
Jean-Yves Gaulier
a516f52cd2 #PHRAS-750 #time 20m 
prevent form autocomplete
 2015-10-07 16:22:46 +02:00
jygaulier
fcf199cc6e Merge pull request #1526 from jygaulier/PHRAS-750_ftp-proxy-auth 
#PHRAS-750 #time 3h
 2015-10-07 15:53:09 +02:00
Jean-Yves Gaulier
2148749721 #PHRAS-750 #time 3h 
add proxy user/pwd to ftpclient object
add proxy user/pwd to ftp task interface
 2015-10-07 15:51:49 +02:00
jygaulier
294b02caa6 Merge pull request #1522 from jygaulier/PHRAS-741_back-office-events 
#PHRAS-741 #time 10m
 2015-10-05 17:16:58 +02:00
Jean-Yves Gaulier
ce6e42e9b4 #PHRAS-741 #time 15m 
added 2 events
 2015-10-05 17:13:41 +02:00
Jean-Yves Gaulier
2ac08d225f #PHRAS-741 #time 10m 
fix event/es
 2015-10-05 15:36:17 +02:00
jygaulier
8747de6684 Merge pull request #1521 from jygaulier/PHRAS-741_back-office-events 
#PHRAS-741 #time 15m
 2015-10-05 15:07:24 +02:00
Jean-Yves Gaulier
a63958ed9c #PHRAS-741 #time 15m 
added 2 events
 2015-10-05 15:00:45 +02:00
Benoît Burnichon
baefbf5c61 Add method to Api Form Factory factories 2015-10-05 10:42:27 +02:00
jygaulier
11053eea62 Merge pull request #1520 from jygaulier/PHRAS-741_back-office-events 
#PHRAS-741 #time 10m
 2015-10-01 19:34:06 +02:00
Jean-Yves Gaulier
3b56d115cb #PHRAS-741 #time 10m 
get the user of acl
removed useless code
 2015-10-01 19:18:02 +02:00
Benoît Burnichon
ec049afc76 Merge pull request #1519 from jygaulier/PHRAS-741_back-office-events 
PHRAS-741
 2015-10-01 10:48:55 +02:00
Jean-Yves Gaulier
e1a1673d5d #PHRAS-741 #time 1m 
fix
 2015-09-30 18:42:54 +02:00
Jean-Yves Gaulier
3c6ef86e24 #PHRAS-741 #time 1m 
fix
 2015-09-30 18:28:57 +02:00
Jean-Yves Gaulier
77667e3478 #PHRAS-741 #time 5m 
removed type hinting :( to allow null argument
 2015-09-30 18:20:24 +02:00
Benoît Burnichon
9672903883 Merge pull request #1517 from bburnichon/api-v1.5-PHRAS-748 
Bump API_VERSION to 1.5.0

PHRAS-748 #time 15mn
 2015-09-30 18:18:50 +02:00
Jean-Yves Gaulier
cbc67dec0e #PHRAS-741 #time 5m 
fix used event id to match new tense
 2015-09-30 18:03:24 +02:00
Benoît Burnichon
731a389c7a Bump API_VERSION to 1.5.0 2015-09-30 17:56:55 +02:00
Jean-Yves Gaulier
7298477fc7 #PHRAS-741 #time 1m 
add forgotten files...
 2015-09-30 17:43:29 +02:00
Jean-Yves Gaulier
0f59534b2a #PHRAS-741 #time 1d 
back-office events :
refactor account / acl to conform past tense, ex. "creatED"
removed "event" from names
added events for collection / databox
 2015-09-30 17:41:42 +02:00
Benoît Burnichon
63a7129a66 Fixup Profiler bar error and added /h1 in exception handler 2015-09-28 18:44:06 +02:00
Jean-Yves Gaulier
808b0d7fa9 #PHRAS-741 #time 5h 
add back-office events : account, acl
 2015-09-28 17:31:52 +02:00
Benoît Burnichon
89f705eebe Merge pull request #1509 from aztech-dev/3.8 
Require admin right for user management via API
 2015-09-25 16:23:44 +02:00
Benoît Burnichon
7bddf56d69 revert exists filter and replacing by a generic one 2015-09-24 17:08:30 +02:00
Benoît Burnichon
4725e37e97 Add existsSql to User_Query 2015-09-24 13:12:51 +02:00
Benoît Burnichon
0a1f3efe60 User_Query in operator has missing space 2015-09-23 17:57:32 +02:00
Florian BLOUET
ac49c5b638 fix default include path for plugins 2015-09-23 12:05:20 +02:00
Thibaud Fabre
476a3aa67c Require admin right for user management via API 2015-09-22 18:47:39 +02:00
Benoît Burnichon
8b4c5da33b Merge pull request #1508 from bburnichon/PLUG-121 
Add a fallback plugin handling twig
 2015-09-22 16:59:54 +02:00
Benoît Burnichon
78da11edfa Add a fallback plugin handling twig 2015-09-22 16:58:25 +02:00
Benoît Burnichon
3e19a28b5c Add MockedAuthenticatedVoter because at least one voter is needed 2015-09-21 19:44:28 +02:00
Benoît Burnichon
69ac680dc7 Add CreateFormBuilder to BaseController 2015-09-21 18:49:56 +02:00
Benoît Burnichon
b21c0eed12 Bump rest-bundle 2015-09-18 19:30:26 +02:00
Benoît Burnichon
cf5a48a91d Merge pull request #1504 from bburnichon/voter-PLUG-112 
Add Security Voter

PLUG-112
Includes PHRAS-717
 2015-09-17 13:44:05 +02:00
Benoît Burnichon
fede33a0ca Use Voter in Admin for configurationPanes 2015-09-16 16:50:04 +02:00
Benoît Burnichon
cfa36bbfb2 Merge remote-tracking branch 'fblouet/hotfix/PHRAS-717' into voter-PLUG-112 2015-09-16 15:43:29 +02:00
Benoît Burnichon
1260152fc4 Use voters in workzone, actionbar and basket_actionbar 2015-09-16 15:37:04 +02:00
Benoît Burnichon
c9503c8204 Add Base Controller with isGranted method 2015-09-16 12:36:58 +02:00
Benoît Burnichon
d647a6d821 Change ORM instantiation to allow hooking 2015-09-15 15:59:46 +02:00
Benoît Burnichon
e027eb1bfa Add BaseVoter and Authorization Service Provider 
PLUG-112
 2015-09-14 22:49:26 +02:00
Florian BLOUET
de2e48b1a6 PHRAS-717 - fix plugin workzone - shouldn't be rendered if empty 2015-09-11 16:49:01 +02:00
Benoît Burnichon
45ded0107a Merge pull request #1500 from bburnichon/mapping-subdefs-PLUG-7 
Mapping subdefs
 2015-09-08 20:58:55 +02:00
Benoît Burnichon
e23b19bcd6 PHPCS 2015-09-08 20:45:03 +02:00
Benoît Burnichon
52ebf7471a Change pluginMetadata to include configuration panes serviceIds 2015-09-08 10:55:36 +02:00
Benoît Burnichon
d9092e60d4 Add Configuration logic and translations 2015-09-08 10:55:36 +02:00
Benoît Burnichon
42a442f1ea Merge pull request #1496 from lostdalek/hotfix/PLUG-90 
PLUG-90
 2015-09-07 10:06:03 +02:00