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
16,257 Commits 268 Branches 107 Tags
e591125e83cbbf09dd6d2dd73a19cb3ee758e40c
Commit Graph

16257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
nmaillat
7efd7915a4 typo fix 2021-06-30 13:16:03 +02:00
nmaillat
7ab4bf2d77 help in .env 2021-06-30 13:16:03 +02:00
nmaillat
d96a856d1e implement -m 0 for bin/console launch method 2021-06-30 13:16:03 +02:00
nmaillat
9a653b56db clean on worker entrypoint 2021-06-30 13:16:03 +02:00
nmaillat
25550d61ce remove grouped jobs 2021-06-30 13:16:03 +02:00
nmaillat
31a39b4f70 PHRAS-3463 add option for launching Phraseanet workers with supervisor 2021-06-30 13:16:03 +02:00
aynsix
0a6fc13761 update 2021-06-30 11:40:18 +03:00
aynsix
847fa8e347 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3438-proxy-expose-service 2021-06-30 11:31:42 +03:00
Nicolas Maillat
1c1fc162ca Merge pull request #3819 from alchemy-fr/PHRAS-3471_notifications-ux 
PHRAS-3471 Merge clean notifications ux and design
 2021-06-30 10:20:33 +02:00
jygaulier
8874f21293 PHRAS-3471_notifications-ux 
fix : better ux, better scss
removed / comment dead code/scss
fix z-index of "new basket"
 2021-06-29 17:32:49 +02:00
aynsix
c465ffb6ec add logout and expose login information 2021-06-29 14:54:34 +03:00
aynsix
fba3fea71c add proxy expose 2021-06-28 18:25:39 +03:00
Nicolas Maillat
c5912d4a5e Merge branch 'master' into PHRAS-3461_clean-notifications 2021-06-28 11:54:34 +02:00
Nicolas Maillat
8062073512 Merge pull request #3817 from alchemy-fr/PHRAS-3438-fix-uploader-proxy 
PHRAS-3438 merge fix uploader proxy
 2021-06-28 11:50:06 +02:00
Nicolas Maillat
48633e875f Merge branch 'master' into PHRAS-3438-fix-uploader-proxy 2021-06-28 10:49:31 +02:00
aynsix
e51d4ee5b2 fix uploader proxy 2021-06-28 11:44:14 +03:00
Nicolas Maillat
3c39f5f13e Merge pull request #3814 from alchemy-fr/PHRAS3469_slow-basket-select 
PHRAS-3469 merge slow-basket-select
 2021-06-28 10:21:36 +02:00
jygaulier
a98266b67b Merge branch 'master' into PHRAS-3461_clean-notifications 2021-06-24 21:35:11 +02:00
jygaulier
70a3a24c5b PHRAS3469_slow-basket-select 
fix : replace left joins by "inner join"+"union"
 2021-06-24 20:08:04 +02:00
Nicolas Maillat
13b00ed684 Merge pull request #3813 from alchemy-fr/PHRAS-3460-timeline-tab 
PHRAS-3460 merge Prod - Detailed view - Timeline tab (History) - events sorting is wrong and some events do not appear
 2021-06-24 18:27:25 +02:00
aynsix
8ab3214808 PHRAS-3460 timeline tab 2021-06-24 17:46:40 +03:00
aynsix
c900908fa2 add bloc network-proxy if not exist 2021-06-24 15:07:40 +03:00
aynsix
0e2a8a544a Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3360-missing-worker-section 2021-06-24 14:01:00 +03:00
jygaulier
0d8e1d396f PHRAS-3461_clean-notifications 
add "bin/console maintenance:clean:notifications"
 2021-06-24 12:31:31 +02:00
jygaulier
31d7d9a735 PHRAS-3461_clean-notifications 
wip
[skip ci]
 2021-06-24 12:03:53 +02:00
Nicolas Maillat
50877afe31 Merge pull request #3811 from alchemy-fr/PHRAS-3438-http-server-proxy 
PHRAS-3438 : conf/configuration.yml - Set an http and ftp proxy and use serveur Side eg worker ; geocoding request, ftp.
PHRAS-3464: launch PMA, ELK, FTP containers with their own docker-compose file for more compositing.
docker-compose down is recommended before deploy this PR , check also our COMPOSE_FILE for selecting which containers will be launch.
 2021-06-24 11:25:58 +02:00
aynsix
f311ff7a04 fix env 2021-06-24 12:03:26 +03:00
aynsix
ca932bf63c fix default config 2021-06-24 11:51:32 +03:00
aynsix
837cc37ce6 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3360-missing-worker-section 2021-06-24 11:42:58 +03:00
aynsix
a76e8e178a Merge branch 'PHRAS-3438-http-server-proxy' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3438-http-server-proxy 2021-06-24 11:35:42 +03:00
aynsix
f4155d285a fix proxy config user to null 2021-06-24 11:35:22 +03:00
Nicolas Maillat
902e5bebdb Merge branch 'master' into PHRAS-3438-http-server-proxy 2021-06-23 20:59:02 +02:00
Nicolas Maillat
6d72181756 PHRAS-3442 fix missing cache repo 2021-06-23 19:37:53 +02:00
Nicolas Maillat
b496a58a9f Merge pull request #3799 from alchemy-fr/PHRAS-3442_optimize-list-notifications_4.1-bis 
PHRAS-3442 merge optimize-list-notifications_4.1-bis
 2021-06-23 19:10:33 +02:00
aynsix
3c7414c3df detached elk and ftp services 2021-06-23 15:16:42 +03:00
aynsix
83d9b542ae detached pma service 2021-06-23 14:45:31 +03:00
aynsix
bc56c97e33 fix 2021-06-23 10:43:42 +03:00
jygaulier
251eff2e56 PHRAS-3442_optimize-list-notifications_4.1-bis 
WIP
fix : if user reconnects with another window/login, all windows will redirect to the home and log again
 2021-06-22 20:54:45 +02:00
jygaulier
03e83d181a PHRAS-3442_optimize-list-notifications_4.1-bis 
WIP
fix : click on "you have received a new basket" hides the message (thks Aina)
 2021-06-22 14:51:05 +02:00
aynsix
79d303ec86 ftp config to false by default 2021-06-22 15:12:03 +03:00
aynsix
2c7d18529e remove authmod config 2021-06-22 13:56:16 +03:00
aynsix
ecc84e61da PHRAS-3438 fix squid container 2021-06-22 11:59:27 +03:00
jygaulier
0305818a6e PHRAS-3442_optimize-list-notifications_4.1-bis 
WIP
factorize js
less js in twig
fix "mark as read" in dropdown
fix refresh after read
 2021-06-21 18:07:47 +02:00
jygaulier
0c58dd2af2 PHRAS-3442_optimize-list-notifications_4.1-bis 
WIP
restore /session/update route to pass tests, THIS ROUTE IS UNUSED
 2021-06-21 18:07:47 +02:00
jygaulier
354636150e PHRAS-3442_optimize-list-notifications_4.1-bis 
WIP
fix tests
 2021-06-21 18:07:47 +02:00
jygaulier
47c0e4b1cc PHRAS-3442_optimize-list-notifications_4.1-bis 
WIP
mark notif as read
fix test
 2021-06-21 18:07:47 +02:00
jygaulier
f8cfd08f4f PHRAS-3442_optimize-list-notifications_4.1-bis 
WIP : pushed to run all tests on circle
move "session/notifications" controller to "user/notifications"
use twig to render notifs + dropdown + dlg
fixed some tests
still todo : mark "read"
 2021-06-21 18:07:47 +02:00
jygaulier
6472ce360f PHRAS-3442_optimize-list-notifications_4.1-bis 
WIP
fix tests
todo : mark read notifications (button ? click ?)
 2021-06-21 18:07:47 +02:00
jygaulier
c6784d14c1 PHRAS-3442_optimize-list-notifications_4.1-bis 
WIP
rebase
 2021-06-21 18:07:47 +02:00
jygaulier
22c3b273f7 PHRAS-3442_optimize-list-notifications_4.1-bis 
WIP
poll only from menubar (Aina)
back : only one method/route to fetch notifs
front : fix exponential pagination
big refacto
todo : mark read notifications (button ? click ?)
 2021-06-21 18:07:46 +02:00