hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-14 13:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,001 Commits 268 Branches 107 Tags
53b8ca40872a04579822b23e2b51b43b30cc652f
Commit Graph

4675 Commits

Author SHA1 Message Date
Benoît Burnichon
9842af9b1a Error in Assertion in OrderElement add 2016-05-12 16:07:09 +02:00
Benoît Burnichon
7da4a65a93 Handle non unique recordIds in Repositories 2016-05-12 16:07:09 +02:00
Benoît Burnichon
b61a8a7418 Fixup calls order to avoid N+1 2016-05-12 16:07:09 +02:00
Benoît Burnichon
9f615dfb5d Subscriber is on DataRepository not actual repository 2016-05-12 16:07:09 +02:00
Benoît Burnichon
2341641c9e Caption Service tweak 2016-05-12 16:07:09 +02:00
Benoît Burnichon
ae4d46216f Add Caption Service and Repositories 2016-05-12 16:07:09 +02:00
Benoît Burnichon
f6c3672eeb Add RecordCollection class to avoid multiple record_adapter fetching 2016-05-12 16:07:09 +02:00
Benoît Burnichon
23eff5fe28 WIP progress on List Records 2016-05-12 16:07:09 +02:00
Benoît Burnichon
0030e51561 WIP RecordTransformer 2016-05-12 16:07:09 +02:00
Benoît Burnichon
0832343c66 WIP 2016-05-12 16:07:09 +02:00
Benoît Burnichon
0474703d62 Change Api SearchController to use Fractal 2016-05-12 16:07:09 +02:00
Jean-Yves Gaulier
4647824355 PHRAS-1101_THMB-TRAIN-IN-PREVIEW 
#time 3h
fix : preview mode is ok when some collections are unchecked
 2016-05-12 15:45:40 +02:00
Thibaud Fabre
c7b1b6b78d Merge pull request #1830 from aztech-dev/feature/order-webhooks 
Add webhook notifications for order events
 2016-05-12 14:59:59 +02:00
Thibaud Fabre
1a65e8269e Change default notification method for order creation via API 2016-05-12 14:48:03 +02:00
Thibaud Fabre
4ae762657e Update tests to mock event subscribers not mailers 2016-05-12 14:22:49 +02:00
Thibaud Fabre
5495c4b507 Fix initialisation of order event subscriber 2016-05-12 11:44:04 +02:00
Thibaud Fabre
5327b7893b Fix initialisation of notifiers 2016-05-12 11:21:12 +02:00
Benoît Burnichon
60b932d518 Merge branch '4.0' into merge-4.0 
- Ignore modifications in Vagrantfile. Complete rework switching to ansible
- redo composer update of roave/security-advisories and symfony/symfony
- confirm deletion of jquery.WorkZone.js

Conflicts:
	Vagrantfile
	composer.lock
	resources/www/prod/js/jquery.WorkZone.js
 2016-05-12 10:43:30 +02:00
Benoît Burnichon
3abb34a702 Fixup error in reordering of elements 2016-05-11 17:50:57 +02:00
Benoît Burnichon
8e693964df Refactor getChildren() and get_grouping_parents() 2016-05-11 17:50:57 +02:00
Thibaud Fabre
8681f25922 Update docblocks 2016-05-11 17:11:24 +02:00
Thibaud Fabre
2e815bc463 Add SQL migration for new order column and fix docblocks 2016-05-11 16:59:36 +02:00
Florian BLOUET
0eada5fbe1 enable/disable geolocalized search button if providers available - add npm run dev command 2016-05-11 11:13:47 +02:00
Gilles MATEU
bb17d26fa8 spelling error in Configuration.php 
"Confguration compiled." instead of "Configuration compiled."
 2016-05-01 17:55:33 +02:00
Thibaud Fabre
957d588d6f Add order webhook processor 2016-04-29 02:26:28 +02:00
jygaulier
247f509d8f Merge pull request #1826 from jygaulier/PHRAS-1094_ES-LIB-UPGRADE 
PHRAS-1094_ES-LIB-UPGRADE
 2016-04-28 19:32:45 +02:00
Thibaud Fabre
276b060c58 Add order validation notifier interface and mailer implementation 2016-04-28 16:41:26 +02:00
Jean-Yves Gaulier
95b52c038b PHRAS-1094_ES-LIB-UPGRADE 
#time 1d
change : upgrade the php-es lib to 2.x
 2016-04-27 20:06:36 +02:00
Thibaud Fabre
1b1debd09c Add notification method on order entity 2016-04-27 18:06:16 +02:00
Thibaud Fabre
0860a19b73 Merge pull request #1823 from jygaulier/PHRAS-1091_ORDER_ROUTE_STORIES 
PHRAS-1091_ORDER_ROUTE_STORIES
 2016-04-26 15:42:15 +02:00
Thibaud Fabre
673783d912 Merge pull request #1824 from aztech-dev/fix/create-order 
Fix 500 error response when creating an order via the API
 2016-04-26 15:39:37 +02:00
Thibaud Fabre
579293c636 PHRAS-1091 Pass view instead of order to transformer 2016-04-26 15:38:38 +02:00
Jean-Yves Gaulier
96dee67482 PHRAS-1091_ORDER_ROUTE_STORIES 
#time 10m
fix : remove stories from ordered items
 2016-04-25 17:14:51 +02:00
Benoît Burnichon
3ca525fee5 Merge branch '4.0' into merge-4.0 2016-04-22 19:44:05 +02:00
Benoît Burnichon
f84f625a4e All media_subdef updates go to the repository 2016-04-22 16:15:37 +02:00
Benoît Burnichon
c053ef5045 Fixup invalid method name causing tooltip error 2016-04-22 16:14:10 +02:00
Benoît Burnichon
ca6c3f9920 Changes on SubdefGroup reflected in using clients 2016-04-22 12:42:14 +02:00
Benoît Burnichon
2b097e9be7 Extract SubdefGroup class 2016-04-22 12:38:33 +02:00
Benoît Burnichon
b05f9caf6c Merge branch '4.0' into merge-4.0 2016-04-21 13:27:10 +02:00
Thibaud Fabre
06f12cabce Merge pull request #1817 from bburnichon/bug/oauth_token-PHRAS-1086 
OAuth authentication is not properly prioritized
 2016-04-21 13:24:16 +02:00
Benoît Burnichon
ceb8cb55eb Add request query parameter check for oauth_token 2016-04-21 12:14:09 +02:00
Benoît Burnichon
7109131f78 Fixup CookiesDisablerSubscriber for all API routes 2016-04-21 12:13:26 +02:00
Benoît Burnichon
3ca3019668 Wipe record ids out of API search response 
Fix PHRAS-1085
 2016-04-21 11:15:38 +02:00
Benoît Burnichon
8e72370ace Merge branch '4.0' into merge-4.0 2016-04-20 17:24:45 +02:00
Benoît Burnichon
1e18b3e69f This is a combination of 33 commits. 
- Squashed Pull request #1730
- Squashed Pull request #1741
- Squashed Pull request #1742
- Squash merge branch 4.0
- Squashed Pull request #1744
- Squashed Pull request #1746
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed Pull request #1758
- Avoid using imagine/imagine alias as it is causing install issues
- Squashed merge branch 4.0
- Squashed Pull request #1763
- Squashed merge branch 4.0
- Squash of 6 commits
- Squashed merge branch 4.0
- This is a combination of 2 commits.
- Squashed Pull request #1775
- Squashed Pull request #1777
- Squashed Pull request #1779
- Squashed Pull request #1780
- Squashed Pull request #1782
- Adds a Pull request template
- Squased Pull request #1783
- Squash Pull request #1786
- Squashed Pull request #1796
- Squashed merge branch 4.0
- Squash Pull request #1791
- Squashed merge branch 4.0
- Squashed Pull request #1808
- Squashed Pull request #1811
- Squashed Pull request #1809
 2016-04-20 16:22:14 +02:00
Benoît Burnichon
86b2f88722 Fixup timestamp issue and wrong variable use 2016-04-19 17:04:55 +02:00
Benoît Burnichon
5e84eccce8 Add OAuth authenticated routes to exceptions 2016-04-19 14:55:32 +02:00
Benoît Burnichon
f8fc74344e Refactor SessionManagerSubscriber 2016-04-19 14:55:09 +02:00
Thibaud Fabre
4bd220c6e7 Merge pull request #1809 from bburnichon/improvement/search 
Add caching of all subdefs of a record
 2016-04-18 11:21:30 +02:00
Benoît Burnichon
fef27d31bd Fix calls to Options setters 2016-04-15 17:15:56 +02:00