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

266 Commits

Author SHA1 Message Date
jygaulier
f967588251 PHRAS-3667_refresh-one-basket WIP (#4012) 
* PHRAS-3667_refresh-one-basket
- new "wip" icon
- deploying a basket refreshes icons
todo:
- refreh also when closing ?
- refresh on notification about "share ok" ?
- refresh after real-time op (e.g. share a simple basket ==> wip) ?

* PHRAS-3667 : try to move wz/basket menus (failed)

* PHRAS-3667_refresh-one-basket
- fix : stories deployed looks empty
 2022-05-11 11:24:45 +02:00
Aina Sitraka
ab1ef68af2 PHRAS-3223 Admin - user details - display AuthFailure and Authprovider info (#4002) 
PHRAS-3223
* add auth failure tab

* auth provider list

* api oauth code list

* fix limit

* delete modificaiton date

* add mail locked only filter

* add badge on api list
 2022-04-06 10:45:49 +02:00
aynsix
aa004dd9fd filter model only 2022-03-30 19:56:33 +03:00
aynsix
e8ddf51074 add display model filter 2022-03-28 13:00:16 +03:00
aynsix
15edbb0d20 date filter on admin user list 2022-03-24 12:25:32 +03:00
aynsix
c4f761816c filter phantoms only 2022-03-17 17:43:38 +03:00
aynsix
4bb577cf42 fix search filter and export 2022-03-16 18:41:58 +03:00
aynsix
6d3510b8f2 title as pdf name 2022-02-11 12:15:31 +03:00
aynsix
f22eed2783 add option filename when download check 2022-02-08 16:14:26 +03:00
aynsix
f7fbec3cf7 some improvement 2022-02-04 16:16:20 +03:00
aynsix
6240f1f888 check right on subdef 2022-02-01 16:44:24 +03:00
aynsix
d0d7599fd9 fix document subdef 2022-02-01 11:04:20 +03:00
aynsix
b52fdddb2b select subdef to download 2022-01-31 19:56:55 +03:00
aynsix
94a9a37569 subdef mapping 2022-01-31 17:07:34 +03:00
aynsix
a6fcb0ec93 PHRAS-3555 missing translation 2021-12-06 10:17:44 +03:00
jygaulier
a6f1d40517 PHRAS-3564 
WIP fix
 2021-11-25 17:24:15 +01:00
Nicolas Maillat
d4e16d7c02 Merge branch 'master' into PHRAS-1974_rgpd-remove-unactive-users 2021-09-23 11:40:05 +02:00
aynsix
fe2c97b237 port 4.1 advanced search sort by 2021-09-06 11:51:09 +03:00
jygaulier
b132a6109b PHRAS-1974_rgpd-remove-unactive-users 
fix : last_connection is patched with datetime
add : bin/console
 2021-08-04 21:10:02 +02:00
aynsix
b4a70c2b0c send password setup after mail confirmation 2021-07-28 16:14:38 +03:00
aynsix
30fe7c0061 unlock email before send password email 2021-07-27 11:51:34 +03:00
aina esokia
215562ab74 PHRAS-3256 take in account langage in mail 2021-02-03 11:44:42 +03:00
jygaulier
99be4ea1d3 WIP DO NOT MERGE 
- add : route GET:records
- add : route POST:records (can create a record without document)
- add : json can be passed in body OR in a multiparm parm named "body" (to allow upload of file along with json)
- change : story content (children) is now a list of urls (=get action on each child)
 2020-09-17 18:57:13 +02:00
aynsix
92502d8caa search user on like %...% 2020-05-29 11:25:37 +03:00
aynsix
2545d41e8d trim email from form 2020-04-23 12:14:40 +03:00
aynsix
ca2611f4c9 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2979-41-fix-right-access 2020-03-18 14:18:34 +03:00
aynsix
597216429a fix right access and right on story elements per user 2020-03-12 16:16:41 +03:00
Nicolas Maillat
4714f7b95d Merge branch 'master' into PHRAS-2680-webhook-privacy-and-security 2020-02-26 20:15:37 +01:00
gjacobjn
2f02cef4b0 Update Edit.php 2020-02-06 10:48:16 +01:00
Nicolas Maillat
8019cc3bd0 Merge branch 'master' into PHRAS-2680-webhook-privacy-and-security 2019-09-30 15:49:33 +02:00
aynsix
5d8132b08d user webhook: registration and delete 2019-09-20 18:01:23 +04: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
aynsix
9809e8f176 modify create guest account and filter guest user (#2534) 2018-06-14 19:16:10 +02:00
mike-esokia
75db45ee87 PORT PHRAS-1879 to 4.1 (#2515) 2018-03-15 17:09:45 +01:00
aynsix
ed29948a33 add filter to hide special account in user list (#2522) 2018-03-15 17:04:29 +01:00
Mike Ng
30f49bdd35 resolve conflict 2018-01-08 15:57:13 +04:00
Mike Ng
e9e9a737c3 PORT PHRAS-1559 and PHRAS-1560 to 4.1 2017-12-13 10:26:24 +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
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
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
d924a8aad5 Fix JSON schema decode error 2016-05-17 23:17:10 +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
Florian BLOUET
4efc2dbba2 PHRAS-681 - fix variable initialisation 2016-02-17 15:09:30 +01:00
Florian BLOUET
a7b124940f PHRAS-681 - add missing initialisation for variable 2016-02-17 15:09:30 +01:00
Florian BLOUET
91edc4d822 PHRAS-681 - fix default value of advanced search options: sort value and sort order 2016-02-17 15:09:30 +01:00
Benoît Burnichon
d5bf3b742e Twig uses users User_Query instance, not result iterable 
Introduced by fad68369ca in PR #1690 PHRAS-962
 2016-02-15 15:08:15 +01:00
Benoît Burnichon
59e5b0b0e8 Reformat array and add offset_start variable 2016-02-12 17:29:22 +01:00
Benoît Burnichon
bf3d3ae8f1 Remove useless property 2016-02-12 17:29:22 +01:00