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

3325 Commits

Author SHA1 Message Date
Nicolas Le Goff
cdecfcd0ad Add original name as default title 2014-12-30 17:53:33 +01:00
Nicolas Le Goff
d9239a0b77 Set unique index per instance 2014-12-29 19:51:35 +01:00
Mathieu Darse
1f1264ba54 Merge pull request #9 from nlegoff/flags 
Add flags property
 2014-12-29 11:34:21 +01:00
Mathieu Darse
6ada8bcb1e Merge pull request #10 from nlegoff/base-name 
Add collection name
 2014-12-29 11:15:54 +01:00
Nicolas Le Goff
1763ba5934 Add collection name 2014-12-26 15:26:03 +01:00
Nicolas Le Goff
fc7221fdbc Add flags property 2014-12-26 15:06:30 +01:00
Nicolas Le Goff
5db1d56f64 Fix advanced search display 2014-12-23 18:19:21 +01:00
Mathieu Darse
4ce9bdd105 Add missing NullQueryNode class on last commit 2014-12-23 18:05:47 +01:00
Mathieu Darse
9fff4fdbc0 Allow empty queries (match all) 2014-12-17 23:17:07 +01:00
Mathieu Darse
f83d8109c7 Rename thesaurus service 2014-12-17 22:54:51 +01:00
Nicolas Le Goff
5e33fdafe4 Merge branch '3.8' 
Conflicts:
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Controller/Prod/Edit.php
	lib/Alchemy/Phrasea/Controller/Report/Activity.php
	lib/classes/caption/field.php
	lib/classes/module/report/activity.php
	lib/classes/module/report/download.php
	lib/classes/task/period/apibridge.php
 2014-12-16 13:07:25 +01:00
Mathieu Darse
65d4334dd1 Thesaurus term inference command 2014-12-15 12:25:18 +01:00
Nicolas Le Goff
088b0672cb Fix latest merge 2014-12-15 11:40:30 +01:00
Nicolas Le Goff
086669a39e Fix latest merge 2014-12-12 15:16:49 +01:00
Nicolas Le Goff
76104ce919 Merge pull request #1198 from nlegoff/phras-349 
[3.8.6] Fix edition date for record
 2014-12-11 17:29:26 +01:00
Jean-Yves Gaulier
acf641547a add comments 2014-12-11 14:43:52 +01:00
Jean-Yves Gaulier
a97f97a469 Allows to add attachments to a mail 2014-12-11 14:31:32 +01:00
Nicolas Le Goff
2b243a041b Fix date edit for record 2014-12-10 18:54:29 +01:00
Nicolas Le Goff
0c18434eb4 Fix latest merge 2014-12-10 17:31:07 +01:00
Nicolas Le Goff
589169299c Fix merge 3.8 2014-12-09 14:01:00 +01:00
Nicolas Le Goff
9f38823f27 Merge branch '3.8' 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Command/Setup/H264MappingGenerator.php
	lib/Alchemy/Phrasea/Controller/AbstractDelivery.php
	lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
	lib/Alchemy/Phrasea/Controller/Prod/Edit.php
	lib/Alchemy/Phrasea/Controller/Prod/Story.php
	lib/Alchemy/Phrasea/Controller/Prod/Upload.php
	lib/Alchemy/Phrasea/Controller/Report/Activity.php
	lib/Alchemy/Phrasea/Controller/Report/Root.php
	lib/Alchemy/Phrasea/Controller/Root/Account.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/API/V1/adapter.php
	lib/classes/User/Adapter.php
	lib/classes/databox.php
	lib/classes/media/subdef.php
	lib/classes/module/report.php
	lib/classes/module/report/activity.php
	lib/classes/module/report/connexion.php
	lib/classes/module/report/download.php
	lib/classes/module/report/nav.php
	lib/classes/module/report/question.php
	lib/classes/module/report/sqlaction.php
	lib/classes/module/report/sqlconnexion.php
	lib/classes/module/report/sqldownload.php
	lib/classes/module/report/sqlfilter.php
	lib/classes/task/abstract.php
	locale/de_DE/LC_MESSAGES/phraseanet.mo
	locale/de_DE/LC_MESSAGES/phraseanet.po
	locale/en_GB/LC_MESSAGES/phraseanet.mo
	locale/en_GB/LC_MESSAGES/phraseanet.po
	locale/fr_FR/LC_MESSAGES/phraseanet.mo
	locale/fr_FR/LC_MESSAGES/phraseanet.po
	locale/nl_NL/LC_MESSAGES/phraseanet.mo
	locale/nl_NL/LC_MESSAGES/phraseanet.po
	locale/phraseanet.pot
	templates/web/prod/index.html.twig
	tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/classes/report/activityTest.php
	tests/classes/report/editTest.php
 2014-12-09 13:59:29 +01:00
Nicolas Le Goff
d87553fc3a Merge pull request #1195 from nlegoff/fix-download-report 
[3.8.6] Fix report sql queries for downloads
 2014-12-09 11:14:27 +01:00
Nicolas Le Goff
7ea5cdf834 Fix download 2014-12-05 16:07:45 +01:00
Nicolas Le Goff
9733f9d6a5 PHRAS-349 #fix edition date for stories 2014-12-04 15:29:31 +01:00
Nicolas Le Goff
cabb38937c Fix path to subdefinition 2014-12-04 12:16:13 +01:00
Nicolas Le Goff
4a88d3845c By ref 2014-12-04 11:48:12 +01:00
Nicolas Le Goff
4059f738e7 Typo 2014-12-04 11:48:12 +01:00
Nicolas Le Goff
552bb88d4e Add exif method to record interface 2014-12-04 11:48:12 +01:00
Nicolas Le Goff
c1b1d0db74 Use get_in function 2014-12-04 11:48:11 +01:00
Nicolas Le Goff
e9c6d1a56e Fix mess in prod (record & feed) templates 2014-12-04 11:48:11 +01:00
Nicolas Le Goff
37398816bb Fix record hydration 2014-12-04 11:48:11 +01:00
Nicolas Le Goff
f922dd1f84 Add phraseanet twig extension 2014-12-04 11:48:10 +01:00
Nicolas Le Goff
8e2d9a57c4 Fix feed entry item order 2014-12-04 11:48:10 +01:00
Nicolas Le Goff
b7c428f71f Fix minor issues 2014-12-04 11:48:10 +01:00
Nicolas Le Goff
4d76f374e1 Fix mistake 2014-12-04 11:48:10 +01:00
Nicolas Le Goff
15a03f647d Update according to @mdarse comments 2014-12-04 11:48:09 +01:00
Nicolas Le Goff
1dddcbd3c6 Handle substitution 2014-12-04 11:48:09 +01:00
Nicolas Le Goff
392ff21d51 Clean 2014-12-04 11:48:08 +01:00
Nicolas Le Goff
604416f214 Fix namespaces & method call 2014-12-04 11:48:07 +01:00
Nicolas Le Goff
d5fb2e1cb9 Update Record Hydration 2014-12-04 11:48:07 +01:00
Nicolas Le Goff
e3e7201700 Update Record Interface 2014-12-04 11:48:07 +01:00
Nicolas Le Goff
eb67f67c95 Add ESRecordENtity 2014-12-04 11:48:06 +01:00
Nicolas Le Goff
957f314a07 Delete Record Entities 2014-12-04 11:48:06 +01:00
Nicolas Le Goff
531bd9cc25 Fetch record title 2014-12-04 11:48:06 +01:00
Nicolas Le Goff
87cc2b7a82 Add record title mapping 2014-12-04 11:48:06 +01:00
Nicolas Le Goff
14d91144a0 Fetch subdefs as well for display purpose 2014-12-04 11:48:05 +01:00
Nicolas Le Goff
0edf993472 Add minimal subdef mapping 2014-12-04 11:48:05 +01:00
Nicolas Le Goff
5d0922039a Add has method to check if mapping already exists 2014-12-04 11:48:05 +01:00
Nicolas Le Goff
d666880ada Use ES hydrator to pouplate record from ES query 2014-12-04 11:48:05 +01:00
Nicolas Le Goff
042da9d43e Update record index once subdef has been made 2014-12-04 11:48:05 +01:00