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
12,946 Commits 268 Branches 107 Tags
cb198fb52ff3f4eadf2bc01dbb0722f67be12b34
Commit Graph

4935 Commits

Author SHA1 Message Date
Jean-Yves Gaulier
3b120fb020 PHRAS-2573_last-query-as-default_4.1 
- set default default user settings to "replay last_query on login"
- set a default (empty) query for first login
 2019-06-04 12:07:32 +02:00
Jean-Yves Gaulier
1653c2494c PHRAS-2605_fix-unittest-bootstrap_4.1 
remove debug
 2019-05-28 15:16:28 +02:00
Jean-Yves Gaulier
0cbc5a8ef4 PHRAS-2605_fix-unittest-bootstrap_4.1 
remove debug
 2019-05-28 15:06:06 +02:00
Jean-Yves Gaulier
dca1387a17 PHRAS-2605_fix-unittest-bootstrap_4.1 
fix conf
 2019-05-28 14:59:34 +02:00
Nicolas Maillat
808ee121ad Merge branch 'master' into PHRAS-2529_enable_debug_depending_on_environment 2019-05-16 22:29:57 +02:00
Nicolas Maillat
c77cf24545 Merge branch 'master' into PHRAS-2564-permalink-video-start-url-parameter 2019-05-16 10:56:21 +02:00
aina-esokia
4097e19abb add a video start t parameter in permalink url 
#time 6h
 2019-05-15 16:13:16 +04:00
Jean-Yves Gaulier
0d0e5e6388 PHRAS-2399_arch-task-cnx-timeout_4.1 
add reconnect everywhere
 2019-05-15 11:50:27 +02:00
Jean-Yves Gaulier
c0fb681400 PHRAS-2563_subdef-task-alldb_4.1 
fake change to run tests
 2019-05-14 16:51:43 +02:00
Jean-Yves Gaulier
cf542587a0 PHRAS-2563_subdef-task-alldb_4.1 
subdef task : if the "all" databox is checked, the task runs on every dbox (even the new ones)
also : changed the task-manager notification timeout to 1s to be more responsive.
 2019-05-14 16:51:43 +02:00
MilosEsokia
fa547e15e6 Removing duplicated clause 2019-05-14 13:15:32 +02:00
Nicolas Maillat
6660016b38 Merge branch 'master' into PHRAS-2529_enable_debug_depending_on_environment 2019-05-10 21:15:11 +02:00
aina-esokia
54adff50b9 add monolog handler 2019-05-10 12:15:59 +04:00
MilosEsokia
31a4acda0e Check if config exists 2019-05-08 11:03:03 +02:00
MilosEsokia
7ddf7b61e6 Enable console debug depending on environment 2019-05-07 14:44:34 +02: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
aina-esokia
47d974a466 PHRAS-2497 #comment port to 4.1 Search issue when query mix data from Public and Private field 
#time 2h
 2019-04-23 12:10:25 +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
Nicolas Maillat
2b0f6fda2b Merge pull request #2949 from aynsix/PHRAS-2465-port-upload-by-url 
PHRAS-2465 Port To 4.1 - upload-via-url_4.0
 2019-04-01 15:22:08 +02: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
04da9678ec Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-03-27 10:05:44 +04:00
Harrys
b3976733e4 PHRAS-2430 Restore jsonQuery 2019-03-27 10:04:05 +04:00
aina-esokia
eaf8cf076a port to 4.1 search mix type 2019-03-22 12:04:42 +04:00
Nicolas Maillat
71f0e676f9 PHRAS-2473 Populate improv, sql query optimization. 
PHRAS-2473 Populate time improvement with a sql query optimization
 2019-03-18 15:08:16 +01:00
aina-esokia
8ab2888850 port to 4.1 upload by url 2019-03-18 16:16:14 +04:00
Harrys
0457296a0b PHRAS-2437_Prod_Overlay_title__the_text_is_repeated_if_more_than_102_caracters 2019-03-08 10:30:43 +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
aina-esokia
d2bdd2ed4a port 4.1: migrate field type text to string 2019-01-11 14:45:33 +04:00
Nicolas Maillat
0be1f5d140 PHRAS-2372 strict thesaurus search when indexing 2019-01-09 17:00:06 +01:00
aynsix
c20d385292 PHRAS-2329 Port to master : log_doc error when move a record between collections (#2867) 
* port PHRAS-2317 fix: wrong coll_id in log_docs when move collection

* update
 2018-12-26 09:41:08 +01:00
Filip Vilic
bff7dec769 PHRAS-2350_report_method_fix 2018-12-19 10:12:14 +01: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
Nicolas Maillat
10bd87ff3b Merge pull request #2711 from alchemy-fr/PHRAS-2204_api_webhook_task_error 
PHRAS-2204: Task Manager / Api webhook Task : error on event delivering
 2018-11-15 09:55:33 +00:00
Jean-Yves Gaulier
18cff53c61 PHRAS-2189_report-v2_MASTER 
change patch version because we need to insert a patch before this one
wip
 2018-11-14 15:51:23 +01: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
Jean-Yves Gaulier
e2745cba9e PHRAS-2161_coll-id-in-log-docs_MASTER 
Optimize sql.
Add the "coll_id_from" column in "log_docs" for the "collection" action.
Hydrate a "coll_id" column in "log_view"
 2018-11-14 15:49:10 +01:00
Jean-Yves Gaulier
02efc2b9d1 PHRAS-2161_coll-id-in-log-docs_MASTER 
moved cli "patch:log_coll_id" from bin/developer to bin/setup
cs
 2018-11-14 15:48:41 +01:00