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

1728 Commits

Author SHA1 Message Date
Thibaud Fabre
0bc38c9dd2 Include caption metadatas in search type 2 2016-07-02 14:35:47 +02:00
Thibaud Fabre
0679bd83b5 Merge pull request #1917 from aztech-dev/feature/simplify-story-search-response 
Fix include resolution
 2016-06-30 12:06:44 +02:00
Thibaud Fabre
faf9b98b11 Fix include resolution 
Incorrect use of += operator on arrays caused the story includes to
always be unset
 2016-06-30 11:57:02 +02:00
jygaulier
de997532d2 Merge pull request #1916 from jygaulier/PHRAS-726_delete-candidate 
PHRAS-726_delete-candidate
 2016-06-28 20:33:18 +02:00
Jean-Yves Gaulier
69cc533ff6 PHRAS-726_delete-candidate 
- change : thesaurus pool notifications is 10s
- fix : thesaurus / delete term is ok

#time 1h
 2016-06-28 19:10:23 +02:00
jygaulier
a934280052 Merge pull request #1914 from jygaulier/PHRAS-726_delete-candidate 
PHRAS-726_delete-candidate
 2016-06-28 17:16:07 +02:00
Jean-Yves Gaulier
9c32183747 PHRAS-726_delete-candidate 
- remove : prod / replace candidate is removed from menu
- fix : thesaurus / delete candidate is ok

#time 1h
 2016-06-28 16:54:32 +02:00
Jean-Yves Gaulier
ef108d543e PHRAS-726_delete-candidate 
- change : prod / delete candidate does not update records metadata
- change : prod / replace candidate is disabled
- fix : prod / delete candidate is ok

#time 2h
 2016-06-28 15:12:31 +02:00
Thibaud Fabre
5648f3219c Remove records property from story search results 2016-06-28 13:12:58 +02:00
Jean-Yves Gaulier
9e891d4ae9 PHRAS-1164_Backport-PHRAS-1158-to-4.0 
#time 20m
 2016-06-16 16:02:26 +02:00
Thibaud Fabre
fab4a6e6d5 Fix incorrect file names for filename containing dots 2016-06-13 18:57:23 +02:00
Thibaud Fabre
a2ae899121 PHRAS-573 Add status rights in /me response 2016-05-25 14:08:34 +02:00
Thibaud Fabre
bf08667d0d PHRAS-572 List user rights by databox in /me route 2016-05-25 11:57:03 +02:00
Thibaud Fabre
9008561891 Merge pull request #1882 from aztech-dev/fix/application-settings-access 
Restrict application settings access to application owner
 2016-05-24 18:17:48 +02:00
Thibaud Fabre
010b7b7be2 Restrict application settings access to application owner 2016-05-24 17:45:38 +02:00
Thibaud Fabre
f4d71eeb63 Display unique collection IDs in collection admin 2016-05-24 17:30:02 +02:00
Thibaud Fabre
888a2b4bb6 Add configuration option to disable SSL requirement on API 2016-05-24 15:38:59 +02:00
Thibaud Fabre
e37437084b Merge pull request #1877 from aztech-dev/fix/api-order-download 
Fix archive path when downloading orders via API
 2016-05-24 11:52:05 +02:00
Thibaud Fabre
cf684cdeca Fix archive download via API 2016-05-23 17:54:40 +02:00
Florian BLOUET
b7a3571d04 PHRAS-851 - add databox name, collection name and logo to record title in preview 2016-05-23 11:36:25 +02:00
Benoît Burnichon
2d60fe854e str_replace / by _ in labels of permalinks 2016-05-20 17:19:46 +02:00
Benoît Burnichon
9d77c31c99 Make some list Methods private and remove unused one. 2016-05-19 13:53:40 +02:00
Benoît Burnichon
d4855ebb27 Add TraceableArraySerializer to be able to debug calls 2016-05-19 13:53:40 +02:00
Benoît Burnichon
5edf7b7984 Use RecordCollection as it filters out missing records 2016-05-19 13:50:08 +02:00
Benoît Burnichon
67b27650b4 Use same init process in searchRecordsAction and searchAction 2016-05-19 13:50:08 +02:00
Benoît Burnichon
148568080f Bump fractal version to development one. 2016-05-19 13:50:08 +02:00
Benoît Burnichon
e995085fd6 Add some fractal utility classes 2016-05-19 13:44:01 +02:00
Benoît Burnichon
71b370f766 Fixup calls order to avoid N+1 2016-05-19 13:44:01 +02:00
Benoît Burnichon
7e9e34a87d Subscriber is on DataRepository not actual repository 2016-05-19 13:44:01 +02:00
Benoît Burnichon
f87fc35f6a Caption Service tweak 2016-05-19 13:44:01 +02:00
Benoît Burnichon
7aa499716b Add Caption Service and Repositories 2016-05-19 13:44:01 +02:00
Benoît Burnichon
72d4647d11 WIP progress on List Records 2016-05-19 13:44:01 +02:00
Benoît Burnichon
126b83ec7c WIP RecordTransformer 2016-05-19 13:44:01 +02:00
Benoît Burnichon
24143759a7 WIP 2016-05-19 13:44:01 +02:00
Benoît Burnichon
e2e1fb0e09 Change Api SearchController to use Fractal 2016-05-19 13:44:01 +02:00
Benoît Burnichon
ea808d23d7 Tokens should be string, not objects. 2016-05-19 10:53:07 +02:00
Benoît Burnichon
ca6c3f9920 Changes on SubdefGroup reflected in using clients 2016-04-22 12:42:14 +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
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
Jean-Yves Gaulier
1c63194400 PHRAS-1065 #time 1h 
backport PHRAS-947
 2016-04-06 19:10:54 +02:00
Benoît Burnichon
a547a04aa6 Move Order controllers to same namespace 2016-03-22 16:14:08 +01:00
Benoît Burnichon
a5f9ace717 fix Basket owning setting when providing it 2016-03-22 16:13:22 +01:00
Benoît Burnichon
a0983d39b2 WIP 2016-03-22 16:13:22 +01:00
Benoît Burnichon
f07b7b6722 WIP 2016-03-22 16:13:19 +01:00
Benoît Burnichon
4d65085b46 Extract OrderFiller 2016-03-22 15:55:54 +01:00
Benoît Burnichon
1982d0a625 Prepare extraction of class from OrderController 2016-03-22 15:55:54 +01:00
Benoît Burnichon
cb87d7c0f1 Refactor OrderController 2016-03-22 15:55:54 +01:00
Benoît Burnichon
63d4923292 Remove some unused statements 2016-03-22 15:55:51 +01:00
Benoît Burnichon
f2e62abd8b Remove !count() calls 2016-03-11 18:03:53 +01:00
Benoît Burnichon
8f6f475b7d Add private fields to caption when available to user 2016-03-07 18:39:29 +01:00