hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 13:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,146 Commits 268 Branches 107 Tags
PHRAS-4131-set-order-add-loader
Commit Graph

226 Commits

Author SHA1 Message Date
Jean-Yves Gaulier
32fbf049cf PHRAS-2757_print-feedback_4.1 
Add a print format when printing a feedback basket
Only the creator of the feedback can print it.
 2020-01-09 20:31:09 +01:00
Nicolas Maillat
9731a11520 Merge branch 'master' into PHRAS-2680-webhook-privacy-and-security 2019-11-26 17:46:31 +01:00
Harrys Ravalomanana
df86aac2ba PHRAS-2766 #comment port 41 Add status change capabilities to quarantine #time 3h 2019-10-29 16:48:14 +04:00
aynsix
5d8132b08d user webhook: registration and delete 2019-09-20 18:01:23 +04:00
aynsix
5cdf473c7f PHRAS-1972: Account Page, Allow a Phraseanet User to delete his account and associated datas (#2918) 
* allow user to delete account

* generate translation and add checkbox in the windows confirmation

* change text an configuration key

* update delete account fonctionality

* rename variable

* write in explicite condition

* merge yarn.lock

* regenerate translation
 2019-04-08 14:25:17 +02:00
Nicolas Maillat
b1fb69cac3 Merge pull request #2489 from aynsix/PHRAS-569-ajout-info-/api/v1/quarantine 
PHRAS-569 Add "reasons" in api/v1/quarantine
 2018-03-06 15:11:47 +01:00
aina-esokia
7ebcd8ae9b add info to api/quarantine 2018-03-02 18:06:01 +04:00
KallooaSan
00be9e51b0 PHRAS-1895_PORT_PHRAS-1401_include_json_format_return_record (#2494) 
* PHRAS-1895_PORT_PHRAS-1401 include json format return record

* PHRAS-1895_rollback deleted action ref PHRAS-1688
 2018-02-28 17:31:45 +01:00
aina-esokia
27fd458f30 fetched conflicting recordids each time on called 2018-02-28 10:59:45 +04:00
aina-esokia
bea0f98d19 Update LazaretFile 2018-02-23 11:44:23 +04:00
aina-esokia
aac1bbb34e add record_ids to api/v1/quarantine 2018-02-23 11:22:44 +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
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
229c80fe74 PHRAS-1260_INDEX-WIDTH-HEIGHT 
- new : added size (filesize) of document to es
 - new : methods getWidth(),... to record_adapter
 - fix : template
 2016-11-03 15:27:57 +01:00
Jean-Yves Gaulier
837a294827 PHRAS-1192_quarantaine-by-filenames_4.0 
- add : quarantine thumbnails looks like result thb (zoom, caption, infos, ...) by using the same template
 - removed : some code about highlighting titles
 - fix : double extension on exported files
 2016-09-28 13:16:10 +02:00
Benoît Burnichon
086e7c126c Enlarge FeedEntry length to 1024 chars 2016-05-20 17:01:36 +02:00
Thibaud Fabre
2e815bc463 Add SQL migration for new order column and fix docblocks 2016-05-11 16:59:36 +02:00
Thibaud Fabre
957d588d6f Add order webhook processor 2016-04-29 02:26:28 +02:00
Thibaud Fabre
1b1debd09c Add notification method on order entity 2016-04-27 18:06:16 +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
b619bf7bba Change failed to createion_failed 2016-03-23 12:42:31 +01:00
Thibaud Fabre
773a31d4f8 Add extra event types in webhooks 2016-03-23 12:42:31 +01:00
Benoît Burnichon
25745732b6 Fix OrderElement accept/deny todo count 2016-03-22 16:16:09 +01:00
Benoît Burnichon
5b03159245 Add basket owning logic in Order 2016-03-22 16:13:22 +01:00
Benoît Burnichon
1982d0a625 Prepare extraction of class from OrderController 2016-03-22 15:55:54 +01:00
Benoît Burnichon
8a907e9bb0 Add touch capability to record_adapter. 2016-02-23 10:40:01 +01:00
Benoît Burnichon
a95797efbf Change UserSetting value to bigger non-nullable field 2016-02-16 19:13:28 +01:00
Benoît Burnichon
14fffe314a PHPCS 2016-02-10 19:38:30 +01:00
Thibaud Fabre
dc51e489fe Fix migration from v3.8.8 to v4.0.0 2016-02-03 16:35:20 +01:00
Thibaud Fabre
68b006e76b Fix bugs in webhook management 
- Removes restrictions on event types and names
- Registers service provider in application
 2016-02-02 12:40:05 +01:00
Thibaud Fabre
fa3e49f5fb Configure event processor factory via DI 2016-01-28 18:42:59 +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
91d79678ae LazaretSession could be created by tasks. 
PHRAS-883
 2015-12-22 17:51:22 +01:00
Benoît Burnichon
53a5ff7f3d Change read status of Basket in Repository 2015-12-22 17:44:34 +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
28650e6a66 Add BasketManipulator to unify internal/external API 2015-12-22 17:44:34 +01:00
Benoît Burnichon
00d0ea66bb Change getIsRead to isRead 2015-12-22 14:25:13 +01:00
Benoît Burnichon
0dfe794145 Add some type hints. Rename french variables. 2015-12-22 14:19:34 +01:00
Jean-Yves Gaulier
18909462fa #PHRAS-840 time 12h 
add : es "technical" fields (_index, _type, _version, ...) to es-record
fix: add etag to thumbnail on es answers, based on document _version
clean : obsolete methods calls changed, cs, ...
 2015-12-10 17:58:16 +01:00
Benoît Burnichon
5bb8d4167b Add cascade delete on ApiLog accountId. 
Also add a postConnect listener to enable foreign keys in sqlite
 2015-12-09 13:12:08 +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
Benoît Burnichon
0717b86f5d Change Indexes names to unique ones 2015-11-04 17:14:33 +01:00
Thibaud Fabre
938c92b0c1 Disable demand status emails when mail notifications are disabled 2015-11-02 15:50:19 +01:00
Thibaud Fabre
e2dbc20628 PHRAS-788 Set webhook_url field to correct size 2015-10-30 14:57:53 +01:00
Thibaud Fabre
6882424a01 Add registration related webhooks 2015-10-20 17:45:16 +02:00
Thibaud Fabre
2aa24186f4 Add API routes for password resets 2015-09-22 18:33:06 +02:00
Benoît Burnichon
e8d4d5f38d Record_adapter now uses a specific repository from databox 2015-07-15 11:26:13 +02:00