hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 06:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,091 Commits 268 Branches 107 Tags
b64f677c47f43e88c5a70fc6cb8fe27256b27b05
Commit Graph

1984 Commits

Author SHA1 Message Date
aina-esokia
cd3995382c take account all record type for story cover 2019-07-11 11:31:41 +04:00
aina-esokia
fe48e8a305 api stories add cover source 2019-07-10 14:26:34 +04:00
Jean-Yves Gaulier
ce25275c03 PHRAS-2628_toolbar-plugin_4.1 
allow a plugin to his own js (at the end of the toolbar)
 2019-06-12 15:20:10 +02:00
Jean-Yves Gaulier
dca1387a17 PHRAS-2605_fix-unittest-bootstrap_4.1 
fix conf
 2019-05-28 14:59:34 +02:00
aina-esokia
4097e19abb add a video start t parameter in permalink url 
#time 6h
 2019-05-15 16:13:16 +04:00
Harrys Ravalomanana
dd6422c620 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-04-30 13:48:29 +04:00
aina-esokia
eff72083ba update delete account config structure 
#time 0.5h
 2019-04-25 17:27:33 +04:00
jygaulier
035d804d15 PHRAS-2276 port to 4.1 template escape (#2819) 
* fix escape lightbox

* fix escape in admin connected-user

* fix prod escaping

* fix escaping in thesaurus

* escape when rendered

* escape in controller
 2019-04-08 14:30:00 +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
aina-esokia
c89757c4d7 escape in controller 2019-04-05 15:57:49 +04:00
Harrys Ravalomanana
2390244e9e Merge branch master into PHRAS-2430 2019-04-05 15:11:09 +04:00
aina-esokia
7426eb453d Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2276-port-template-escape 2019-04-05 11:49:45 +04:00
aina-esokia
e68081399d port add model in order manager of collection 2019-04-02 15:36:49 +04:00
aina-esokia
60c126c7b9 escape when rendered 2019-03-29 17:20:04 +04:00
aina-esokia
019498b5c4 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2276-port-template-escape 2019-03-29 17:09:37 +04:00
Harrys
b3976733e4 PHRAS-2430 Restore jsonQuery 2019-03-27 10:04:05 +04:00
aina-esokia
8ab2888850 port to 4.1 upload by url 2019-03-18 16:16:14 +04:00
aina-esokia
605e6b031a fix presets audio name 2019-01-29 16:54:18 +04:00
aina-esokia
a656aa0072 audio subdeffrom video 2019-01-24 18:03:03 +04:00
Filip Vilic
eec09e55cd PHRAS-2327_report_refacto_41 2018-12-11 13:15:03 +01:00
Jean-Yves Gaulier
61058a3658 PHRAS-1326_intl-labels-in-facets_MASTER 
add "labels" array to facets
 2018-11-27 19:33:36 +01:00
jygaulier
e2f5afc07b PHRAS-2292_aggregates-as-new-json_MASTER (#2829) 
* PHRAS-2292_aggregates-as-new-json_MASTER
wip

* PHRAS-2292_aggregates-as-new-json_MASTER

* PHRAS-2292_aggregates-as-new-json_MASTER
fake commit to test circle (did not run on last commit !)
 2018-11-27 10:25:28 +01:00
aina-esokia
d413c86912 port to 4.1 search thesaurus term to all language 2018-11-26 10:48:57 +04:00
aina-esokia
6fe39113c0 fix escaping in thesaurus 2018-11-22 15:10:38 +04:00
aina-esokia
c58ed45333 fix prod escaping 2018-11-22 14:32:42 +04: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
Nicolas Maillat
9298580888 Merge pull request #2789 from xrousset78800/fix/update-access-page-design 
Update access page design
 2018-11-06 16:26:42 +00:00
Nicolas Maillat
36395f25ac Merge pull request #2801 from aynsix/PHRAS-1864-port-41-1868-admin-mount-database 
PHRAS-1864 port to 4.1 PHRAS-1868 database mount
 2018-11-06 09:32:31 +00:00
aina-esokia
18ff40a537 port to 4.1 PHRAS-2227 FIX changing status appear in log_docs table 2018-11-06 11:22:53 +04:00
aina-esokia
9c9d280250 port to 4.1 PHRAS-1868 database mount 2018-11-05 18:22:52 +04:00
Xavier Rousset
a8ebe5fc43 Update access page design 2018-10-19 19:10:39 +02:00
aina-esokia
5948032af6 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2011-personalization-log 2018-08-31 15:41:55 +04:00
Filip Vilic
e41145ead7 PHRAS-2192_detailed_selection_dev box position fix 2018-08-30 10:20:37 +02:00
aina-esokia
5dba9f64dd add personalisation logo 2018-08-29 15:11:04 +04:00
Filip Vilic
5cd490ce99 PHRAS-2192 detailed selection info - html added 2018-08-16 11:37:50 +02: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
aina-esokia
4f996f3ccc masquing some native Api application in user porfil -> Application tab 2018-07-23 11:53:18 +04:00
aina-esokia
4da75f154d add path field in subview window 2018-07-20 17:53:25 +04:00
aina-esokia
2b02d6638e fix 2018-07-19 18:34:43 +04:00
aina-esokia
61741266b4 update setupController 2018-07-19 17:35:54 +04:00
aina-esokia
50f8580e27 add searchengine step in graphic installer 2018-07-18 18:07:25 +04:00
aina-esokia
8c5457d496 fix api version 2018-07-09 14:51:52 +04:00
aina-esokia
82ce18fa00 api substitute update subview when 'document' 2018-07-03 10:05:27 +04:00
aina-esokia
0d2e2eb494 use tmp_files on upload file 2018-06-28 17:32:57 +04:00
aina-esokia
5488d5d47c FIX create subview mediatype dropdown 2018-06-20 17:26:19 +04:00
Nicolas Maillat
9d32f2c0fb Merge pull request #2646 from mike-esokia/PHRAS-2099_refacto_push_feedback 
PHRAS-2099 WIP refacto push feedback
 2018-06-15 16:36:48 +02:00
Mike Ng
83c6dbe1a7 wip - refactor ui of push screen and dialogs 2018-06-15 17:25:46 +04:00
aynsix
9809e8f176 modify create guest account and filter guest user (#2534) 2018-06-14 19:16:10 +02:00
aina-esokia
923265f71b insert or update in technical_data table 2018-06-13 11:06:24 +04:00
aina-esokia
313c902a10 update SubdefsController 2018-06-11 18:20:37 +04:00