hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 22:43:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,165 Commits 268 Branches 107 Tags
ad7cad5e169df7fb8ae2db034148f1259e28bd5b
Commit Graph

371 Commits

Author SHA1 Message Date
aynsix
51b10b6bec add php modification 2020-04-02 14:56:27 +03:00
Nicolas Maillat
d1c299e774 Merge branch 'master' into PHRAS-2680-webhook-privacy-and-security 2020-03-18 11:00:44 +01:00
Nicolas Maillat
4714f7b95d Merge branch 'master' into PHRAS-2680-webhook-privacy-and-security 2020-02-26 20:15:37 +01:00
Nicolas Maillat
d62767ad39 Merge branch 'master' into PHRAS-2741-worker-service-part1 2020-02-26 20:15:15 +01:00
aynsix
2e21bc0448 add model option in user:list 2020-02-26 12:37:05 +03:00
Nicolas Maillat
ed7a5fe288 Merge branch 'master' into PHRAS-2741-worker-service-part1 2020-02-19 20:49:31 +01:00
Jean-Yves Gaulier
50b50116e7 PHRAS-2934_Bad-dctrine-mapping-webhookeventdelivery_4.1 
- added missing relation
 2020-02-18 17:26:45 +01:00
Nicolas Maillat
d7417177e4 Merge branch 'master' into PHRAS-2913_create-tokens-faster_4.1 2020-02-18 15:24:11 +01:00
Jean-Yves Gaulier
5a794c493a create feedEntriesTokens in bulk / doctrine. No more sql 2020-02-11 15:17:13 +01:00
Jean-Yves Gaulier
5f7ca7c9a6 add indexes to table "Tokens" 2020-02-10 11:16:41 +01:00
Jean-Yves Gaulier
e4d3da9336 rollback : can't create token in sql since the om will cry during update. Can't mix om and sql. 2020-02-08 22:29:52 +01:00
Jean-Yves Gaulier
83484e3bd0 fix for unit-testing on null user (to dig : why ?...) 2020-02-08 09:58:57 +01:00
Jean-Yves Gaulier
419440f5c2 fix for failing test 2020-02-07 22:33:18 +01:00
Jean-Yves Gaulier
18993043f2 fake change to re-run tests 2020-02-07 22:14:47 +01:00
Jean-Yves Gaulier
746c9076d4 fix malformed sql 2020-02-07 22:14:47 +01:00
Jean-Yves Gaulier
e75a483cd5 PHRAS-2913_create-tokens-faster_4.1 
- create token by sql
- create feedentry tokens in bulk-sql
 2020-02-07 22:14:47 +01:00
jygaulier
998c751843 Port PHRAS-2877 
Port of PHRAS-2877 User manipulator did not allow to set a null email
Temporary Null email is used by saml plugin while creating a user.
 2020-01-13 14:48:53 +01:00
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
aynsix
12d01afeb0 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2741-worker-service-part1 2019-12-19 16:09:47 +04:00
Harrys Ravalomanana
ad47f4b18c PHRAS-2706 #comment Prod Fix Basket browser #time 2h 2019-12-17 12:07:04 +04: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
Nicolas Maillat
8019cc3bd0 Merge branch 'master' into PHRAS-2680-webhook-privacy-and-security 2019-09-30 15:49:33 +02:00
Nicolas Maillat
b30d458b64 Merge branch 'master' into PHRAS-2741-worker-service-part1 2019-09-23 12:23:46 +02:00
aynsix
c2524e50dc feed webhook 2019-09-20 18:04:05 +04:00
aynsix
5d8132b08d user webhook: registration and delete 2019-09-20 18:01:23 +04:00
aynsix
9aaf66dd7c initialize webhook with worker 2019-09-20 16:55:03 +04:00
Harrys Ravalomanana
947b97ee0b PHRAS-2706 2019-08-13 11:06:57 +04:00
Jean-Yves Gaulier
31b940239f PHRAS-2666_slow-notifications_4.1 
fix dql
!!! WIP !!!
 2019-07-25 19:34:32 +02:00
Jean-Yves Gaulier
3ae0c94863 PHRAS-2666_slow-notifications_4.1 
fix bad fct arg type "string"
!!! WIP !!!
 2019-07-25 17:33:21 +02:00
Jean-Yves Gaulier
2fcbd7e6d7 PHRAS-2666_slow-notifications_4.1 
removed join on basket_elements where useless
code style + type hints
!!! WIP !!!
 2019-07-25 17:23:10 +02:00
Jean-Yves Gaulier
5585893f05 PHRAS-2651_event-to-message_4.1 
fix for php7.1
!!! WIP !!!
 2019-07-25 17:23:10 +02:00
Jean-Yves Gaulier
b0c0f65764 PHRAS-2666_slow-notifications_4.1 
removed join on basket_elements where useless
!!! WIP !!!
 2019-07-25 17:23:10 +02: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
Jean-Yves Gaulier
f7b103af3d PHRAS-2161_coll-id-in-log-docs_MASTER 
- explicit message when databox is failed to mount.
- reconnect db for long migration scripts
- mark (comment) doctrine "binary_strings" type so the upgrade is not done every time because the field was read-back as "varchar"
- proposal on long migration scripts (could be faster)
 2018-11-14 15:49:10 +01:00
jygaulier
e7863122d0 PHRAS-2172_parade-saml-err500_MASTER (#2695) 
fix : the user application was updated (=created) after the check
add : "find()" on user repo (type hinted) to allow code sniff, completion etc.
 2018-07-26 16:34:20 +02:00
mike-esokia
75db45ee87 PORT PHRAS-1879 to 4.1 (#2515) 2018-03-15 17:09:45 +01: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
Thibaud Fabre
77c848f32e Merge pull request #2008 from jygaulier/PHRAS-1260_INDEX-WIDTH-HEIGHT 
Phras 1260 index width height
 2016-11-03 16:22:26 +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
0c75189a64 PHRAS-508_acl-cache 
- refactor : acl strings changed to ACL class constants
 - code cleanup
 - wip but try to merge for bc break test
 2016-10-26 16:13:47 +02:00