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

196 Commits

Author SHA1 Message Date
Mike Ng
0c3918b8a5 updating code 2017-11-17 14:21:11 +04:00
Mike Ng
197612de7b implementation back-end for refactoring of orders 
refactoring layout order-box and order-item
 2017-08-17 14:42:10 +04:00
Mike Ng
191a59c827 add search to candidate tab 
refactor search_term function in backend
 2017-08-15 12:54:16 +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
Thibaud Fabre
88a2813843 Refactor setup controller and registry manipulator 2016-11-25 14:03:01 +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
a702899126 Fix missing return statement 2016-10-25 14:20:36 +02:00
Thibaud Fabre
199b5b1c46 Inject base order controller dependencies 2016-10-25 13:55:34 +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
f62c22bc5c Move setting to registry and form type 2016-09-28 20:58:26 +02:00
Thibaud Fabre
7cf5d28a99 Fix configuration setting access 2016-09-28 20:25:25 +02:00
Thibaud Fabre
c13e086120 Add option to disable API via configuration setting 2016-09-28 20:25:25 +02:00
Thibaud Fabre
303a39e359 Allow removing order masters without adding a new one 2016-07-29 14:46:18 +02:00
Benoît Burnichon
2547ef14fa Add Archive download to Api v2 orders 2016-05-20 13:16:41 +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
3810d2c7e5 Merge pull request #1807 from aztech-dev/feature/oauth-on-download 
Add token based auth on download page
 2016-04-13 15:35:42 +02:00
Thibaud Fabre
ce2ba36660 Add token based auth on download page 2016-04-13 15:21:39 +02:00
Benoît Burnichon
caec735784 Add oauth authentication for export routes. 
export_multi_export, export_mail, export_ftp & export_ftp_test are impacted.
 2016-04-12 18:42:03 +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
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
59a334ea32 New search style 2016-02-22 14:07:16 +01:00
Benoît Burnichon
d93983caeb Add RecordEvent when rotated 2016-02-18 15:28:11 +01:00
Thibaud Fabre
450adb0847 Application bootstrap refactor 
- Extract environment properties in Environment class
- Replaces initialisation closure by ApplicationLoader class
- Removes undesirable error handling/PHP settings modifications
 2016-01-22 17:12:21 +01:00
Benoît Burnichon
7713afeff6 PermalinkController knows about how to retrieve records, not Media service 2016-01-13 15:10:20 +01:00
Benoît Burnichon
575a30436c Remove unused dependency 2016-01-12 20:18:36 +01:00
Benoît Burnichon
51023c5533 bump copyright year 2016-01-05 13:38:14 +01:00
Benoît Burnichon
30b8ec66ed Add API add/remove elements. Change prod basket management 2015-12-22 17:44:34 +01:00
Benoît Burnichon
985ec4a491 Extract JsonBodyHelper and use it 2015-12-22 14:24:32 +01:00
Benoît Burnichon
4a5399d46b Fixup inverted method names in v2 routing 2015-12-22 14:19:35 +01:00
Benoît Burnichon
b2ee2668a1 Change to be able to return called API version 2015-12-22 14:19:34 +01:00
Florian BLOUET
f24bf2f804 embed-bundle: fix assets deployment, make use of mediaService 2015-12-07 16:59:34 +01:00
Florian BLOUET
18f9542098 PHRAS-778 - deactivable documents type permalinks in tools modal 2015-11-18 18:55:05 +01:00
Benoît Burnichon
f684550ab1 Merge pull request #1555 from bburnichon/rebase-web-gallery-v4 
Rebase web gallery v4
 2015-11-09 17:48:22 +01:00
jygaulier
a0d0b78e9c Merge pull request #1560 from jygaulier/PHRAS-797_thesaurus_search_ie11 
#PHRAS-797 time 10m
 2015-11-03 19:26:01 +01:00
Jean-Yves Gaulier
830728f644 #PHRAS-797 time 10m 
fix: app thesaurus, search is ok in ie11
 2015-11-03 19:07:19 +01:00
Thibaud Fabre
51560f4c86 PHRAS-792 Require access to admin module and user management 2015-10-30 14:48:53 +01:00
Benoît Burnichon
f9c02131f1 Remove API after middleware and set token in session 2015-10-29 11:44:10 +01:00
Benoît Burnichon
a1b467d571 Make it possible to use OAuth outside /api 2015-10-28 17:49:11 +01:00
Benoît Burnichon
924f20d19d Add Basic handling of plugins in admin 2015-10-28 13:05:00 +01:00
Benoît Burnichon
c01f3f238f Add basic template and hooks in Admin 2015-10-28 13:03:00 +01:00
Thibaud Fabre
a903594fbc Add API get collection route 
Signed-off-by: Benoît Burnichon <bburnichon@alchemy.fr>
Forward port from 3.8
 2015-10-27 19:35:51 +01:00
Thibaud Fabre
ce9e5fbd45 Add registration routes 2015-10-20 10:42:02 +02:00
Thibaud Fabre
3f5d9763e2 Fix password reset action names 2015-10-20 09:16:32 +02:00
Thibaud Fabre
e434dbabc0 Update password API route 2015-10-20 09:16:32 +02:00