Mike Ng
a08a55b58e
Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log
...
# Conflicts:
# .bowerrc
2018-01-08 16:37:46 +04:00
Mike Ng
e0063d00c0
Porting custom-links to 4.1
2017-12-11 17:44:55 +04:00
jygaulier
a70bf2fc70
PHRAS-1304_AUTO-COMPLETION_MASTER ( #2061 )
...
* PHRAS-1304_AUTO-COMPLETION_MASTER
ported from 4.0
* PHRAS-1304_AUTO-COMPLETION_MASTER
fix
* PHRAS-1304_AUTO-COMPLETION_MASTER
fix
* PHRAS-1304_AUTO-COMPLETION_MASTER
bump php version to 5.5.31 (5.5.21 is obsolete in cicleci)
* PHRAS-1304_AUTO-COMPLETION_MASTER
bump php version to 5.5.31 : php.ini moved in circelci
* PHRAS-1304_AUTO-COMPLETION_MASTER
add zmq & date to php for circleci
* PHRAS-1304_AUTO-COMPLETION_MASTER
add zmq
* PHRAS-1304_AUTO-COMPLETION_MASTER
bump amqp
* PHRAS-1304_AUTO-COMPLETION_MASTER
downgrade amqp to 1.2 to test compilation against old librabbit 0.4 (ubuntu)
* PHRAS-1304_AUTO-COMPLETION_MASTER
add amqp.so to php.ini, (re)bump amqp to 1.6
* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git
* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git again
* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git again and again
* PHRAS-1304_AUTO-COMPLETION_MASTER
fix test on media rotation 600*400 -> 400*599 !!!
* PHRAS-1304_AUTO-COMPLETION_MASTER
restore facebook sdk to 4.0.1 due to mistake
* PHRAS-1304_AUTO-COMPLETION_MASTER
deleted unwanted file
2017-02-06 18:26:56 +01:00
Thibaud Fabre
97f2e66698
Merge 4.0 branch
2016-12-05 17:04:54 +01:00
Thibaud Fabre
b5bbb1851f
Merge branch 4.0
2016-12-05 15:26:48 +01:00
Jean-Yves Gaulier
642da0fca5
PHRAS-508_acl-cache
...
- wip
2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
6a2285f66d
PHRAS-508_acl-cache
...
- wip
2016-10-26 16:13:47 +02:00
Thibaud Fabre
f2b956b015
Merge pull request #1968 from jygaulier/PHRAS-946_delete-record-api
...
PHRAS-946_delete-record-api
2016-09-29 17:41:24 +02:00
Jean-Yves Gaulier
c6186abe56
PHRAS-946_delete-record-api
...
- add : api route to delete record : verb DELETE ; /api/v1/records/{{databox_id}}/{{record_id}}
2016-09-29 15:54:04 +02:00
Thibaud Fabre
08a8970147
Merge pull request #1944 from jygaulier/PHRAS-842_search-logged-as-es_4.0
...
PHRAS-842_search-logged-as-es_4.0
2016-09-29 14:10:21 +02:00
Thibaud Fabre
ebc515f2c1
PHRAS-1006 Add order manager in API collection description
2016-09-27 10:38:34 +02:00
Jean-Yves Gaulier
827e4fe255
PHRAS-842_search-logged-as-es_4.0
...
- fix : query is logged in a "user" form, before parsing
2016-09-22 15:16:36 +02:00
Thibaud Fabre
3072125658
Fix include resolution for search type 2
2016-07-02 15:40:32 +02:00
Thibaud Fabre
8c888b99f5
Fix incorrect include resolution for search type 2
2016-07-02 15:35:45 +02:00
Thibaud Fabre
7141d4c1d5
Rename caption metadata and use preloaded values
2016-07-02 14:53:40 +02:00
Thibaud Fabre
0bc38c9dd2
Include caption metadatas in search type 2
2016-07-02 14:35:47 +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
Thibaud Fabre
5648f3219c
Remove records property from story search results
2016-06-28 13:12:58 +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
f4d71eeb63
Display unique collection IDs in collection admin
2016-05-24 17:30:02 +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
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
Benoît Burnichon
63d4923292
Remove some unused statements
2016-03-22 15:55:51 +01:00
Benoît Burnichon
8f6f475b7d
Add private fields to caption when available to user
2016-03-07 18:39:29 +01:00
Benoît Burnichon
63fd462abe
Change listRecordCaption argument to record_adapter
2016-03-07 13:41:37 +01:00
Benoît Burnichon
b0330d8f56
Added RecordReferenceCollection utility method
2016-03-07 12:30:51 +01:00
Benoît Burnichon
6aa56f24ac
Add SearchEngineResultToRecordsConverter
2016-02-22 14:07:16 +01:00
Benoît Burnichon
054f78815d
group record_adapter fetching in API
2016-02-17 17:07:55 +01:00
Benoît Burnichon
0ef9b668c2
Remove use of gettext shortcut method.
2016-02-01 14:03:29 +01:00
Benoît Burnichon
14cd8a1903
Use existing SubdefSubstituer service i/o record_adapter
2016-01-26 19:17:41 +01:00
Benoît Burnichon
614394edc7
Method renaming
2016-01-26 14:25:08 +01:00
Thibaud Fabre
c92d5da9fe
Merge branch 'clean-boxes' into merge-clean-boxes
2016-01-06 19:53:43 +01:00
Benoît Burnichon
51023c5533
bump copyright year
2016-01-05 13:38:14 +01:00
Benoît Burnichon
00d0ea66bb
Change getIsRead to isRead
2015-12-22 14:25:13 +01:00
Benoît Burnichon
985ec4a491
Extract JsonBodyHelper and use it
2015-12-22 14:24:32 +01:00
Benoît Burnichon
6a8a227bc1
Refactor add/remove records from stories
2015-12-22 14:24:32 +01:00
