hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,324 Commits 268 Branches 107 Tags
b7d1849e243610bacf975b12a620f8a3dd00b409
Commit Graph

11324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benoît Burnichon
b7d1849e24 Tweak travis.yml 2016-05-11 15:43:47 +02:00
Thibaud Fabre
8194a6e362 Merge pull request #1827 from gillesmateu/patch-1 
Fix spelling error in compile configuration command
 2016-05-02 15:38:46 +02:00
Gilles MATEU
bb17d26fa8 spelling error in Configuration.php 
"Confguration compiled." instead of "Configuration compiled."
 2016-05-01 17:55:33 +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
Jean-Yves Gaulier
dc4d9d3935 PHRAS-1094_ES-LIB-UPGRADE 
#time 1h
enforce libsass to match node version
 2016-04-28 14:05:06 +02:00
Jean-Yves Gaulier
5a3d7f6ff1 PHRAS-1094_ES-LIB-UPGRADE 
#time 10m
 2016-04-28 11:17:38 +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
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
9667fe05a4 Merge pull request #1821 from bburnichon/merge-4.0 
Merge 4.0
 2016-04-22 20:28:10 +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
3c4c3c9359 Merge pull request #1820 from bburnichon/bug/story-detach-error-PHRAS-1076 
fix listener to be called when refreshing Basket Workzone
 2016-04-22 19:26:28 +02:00
Benoît Burnichon
d6b386662d fix listener to be called when refreshing Basket Workzone 2016-04-22 19:18:29 +02:00
Benoît Burnichon
051d4b41f6 Merge pull request #1819 from bburnichon/bug/image-rotate-issue-PHRAS-1024 
Image rotate issue
 2016-04-22 17:39:30 +02:00
Benoît Burnichon
fca3146f91 Remove subdef etag when marking physically unavailable 2016-04-22 17:07:18 +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
Thibaud Fabre
533e58539f Merge pull request #1818 from bburnichon/merge-4.0 
Merge 4.0
 2016-04-21 13:41:40 +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
Thibaud Fabre
a83fb6b836 Merge pull request #1816 from bburnichon/bug/api-list-stories-PHRAS-1085 
Remove record ids in stories elements search API
 2016-04-21 13:23:06 +02:00
Thibaud Fabre
da492d213f Merge pull request #1815 from bburnichon/merge-4.0 
Merge 4.0 back in master
 2016-04-21 13:21:59 +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
Thibaud Fabre
2bff9dc26d Merge pull request #1814 from bburnichon/feature/order-api-backport 
Backport Orders API
 2016-04-20 16:55:39 +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
Thibaud Fabre
01b06c5144 Merge pull request #1813 from bburnichon/bug/download-oauth-issue 
Bug/download oauth issue
 2016-04-19 17:16:59 +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
b4917aace0 fix search engine query mock 2016-04-15 17:53:59 +02:00
Benoît Burnichon
e46ce07fbb remove unusable @covers annotations 2016-04-15 17:37:23 +02:00
Benoît Burnichon
fef27d31bd Fix calls to Options setters 2016-04-15 17:15:56 +02:00
Benoît Burnichon
dfcf3ca89e Merge pull request #1812 from lostdalek/feature/externalProductionClient 
Bump Phraseanet production client
 2016-04-15 17:14:37 +02:00
Benoît Burnichon
033542ac2f Remove some arguments from query and add them to options 2016-04-15 16:36:28 +02:00
Benoît Burnichon
581d5115af Add FirstResult and MaxPerPage properties to SearchEngineOptions 2016-04-15 16:36:28 +02:00
Florian BLOUET
97c6220055 Bump Phraseanet production client 
- misc fixes
- update loading animation
 2016-04-15 14:21:28 +02:00
Benoît Burnichon
2e3f027b95 Merge pull request #1811 from jygaulier/PHRAS-1072_Export-Logs-To-ES 
PHRAS-1072
 2016-04-14 16:45:44 +02:00
Jean-Yves Gaulier
439517a4b5 PHRAS-1072_Export-Logs-To-ES 
#time 15m
add : 'ip' type to ES mapping builder so a 'ip' field can be created into ES logs
 2016-04-14 16:33:09 +02:00
Benoît Burnichon
e893b84c01 Merge pull request #1810 from lostdalek/feature/externalProductionClient 
add localization for maps, misc fixes
 2016-04-14 16:18:30 +02:00
Florian BLOUET
5aef71f467 linting 2016-04-14 15:54:44 +02:00
Florian BLOUET
0d362c479e add localization for maps, msic fixes 2016-04-14 15:51:42 +02:00
Benoît Burnichon
6801b8a5fa reduce fetchAndSave complexity 2016-04-14 15:09:20 +02:00