hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 20:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,891 Commits 268 Branches 107 Tags
775552f613389c2103d77eb3a5292e60d293baf6
Commit Graph

2332 Commits

Author SHA1 Message Date
Benoît Burnichon
775552f613 Change Version to non-static 2015-03-19 11:28:06 +01:00
Benoît Burnichon
0ce4fd3192 Change to use border-manager as checker registry. 2015-03-17 16:55:55 +01:00
Benoît Burnichon
9a115726f4 Remove use of LazaretCheck::getMessage() static calls 
LazaretCheck should not perform the translations.

It would be better to have Checker registry to find checker to use.
 2015-03-17 15:59:53 +01:00
Benoît Burnichon
c72e31163b Merge remote-tracking branch 'upstream/3.8' 2015-03-13 18:50:49 +01:00
Benoît Burnichon
7734467845 Fix issue with Strict mode 2015-03-13 17:45:48 +01:00
Benoît Burnichon
0ba1dc8334 fix install with version 
Works differently with MariaDB and MySQL.
 2015-03-13 15:52:00 +01:00
Nicolas Le Goff
973d7f68a2 Fix subdef path indexing 2015-03-12 20:10:13 +01:00
Nicolas Le Goff
7596ddc5d2 Fix tests 2015-03-12 17:13:53 +01:00
Nicolas Le Goff
c5a94e6eed Merge pull request #1267 from bburnichon/feature/insight-fixes 
[WIP] Insight fixes
 2015-03-12 17:13:12 +01:00
Nicolas Le Goff
0da5d16aeb Merge pull request #1294 from mdarse/candidates-empty 
Handle case when cterms XML doesn't exist yet
 2015-03-12 17:12:39 +01:00
Mathieu Darse
fc3c81f350 Handle case when cterms XML doesn't exist yet 2015-03-12 16:41:25 +01:00
Benoît Burnichon
7d7e8983c9 Change raw SQL into builder use 2015-03-12 15:08:26 +01:00
Benoît Burnichon
a8c5166ed2 Missing app remove in databox_status 2015-03-12 15:08:26 +01:00
Benoît Burnichon
43bc4dd9bb More SQL Injection prevention. 2015-03-12 15:08:26 +01:00
Benoît Burnichon
135b2fcaff Remove now useless dependency 2015-03-12 15:08:25 +01:00
Benoît Burnichon
541d8a1d27 Fixup error in binary operations. 2015-03-12 15:08:25 +01:00
Benoît Burnichon
66f0379c00 Properly use doctrine DBAL notIn statement 2015-03-12 15:08:25 +01:00
Benoît Burnichon
d9b7c599d4 Always work on 32bits statuses. use base_convert i/o hex2bin 2015-03-12 15:08:25 +01:00
Benoît Burnichon
d2c5ecf620 cleanup some methods in databox_status as only 32bit ints used. 2015-03-12 15:08:25 +01:00
Benoît Burnichon
3205d0e1b6 Fix databox for SQL injections. 2015-03-12 15:08:25 +01:00
Benoît Burnichon
40b894367a Fix caption_field class 
Possible SQL injection
Proper looping when renaming big bunch of metadata.

/!\ Big refactoring in progress
 2015-03-12 15:08:25 +01:00
Benoît Burnichon
82815e0fb5 Possible SQL injection in base box class 2015-03-12 15:08:24 +01:00
Benoît Burnichon
fbfaeba5fe Use proper DBAL connection call with parameter. 2015-03-12 15:08:24 +01:00
Benoît Burnichon
e84061924b Refactor MailChecker to avoid static instance. 2015-03-12 15:08:24 +01:00
Benoît Burnichon
84ef2f438f Refactor base, appbox & databox instanciation process 2015-03-12 15:08:24 +01:00
Jean-Yves Gaulier
92f0b7a195 #PHRAS-423 #time 6h 
restored transparency in stamp
 2015-03-12 11:20:14 +01:00
Nicolas Le Goff
24036bf4ed Fix some tests 2015-03-11 21:50:36 +01:00
Benoît Burnichon
3dfed100ea Double binary to decimal conversion 2015-03-11 17:48:14 +01:00
Benoît Burnichon
089674bc26 replace loop by str_pad 2015-03-11 17:47:40 +01:00
Benoît Burnichon
118bb2f03c Some fixup for ES instance 2015-03-11 15:22:20 +01:00
Mathieu Darse
63eaaf1596 Merge remote-tracking branch 'upstream/master' into elastic-indexer 
Conflicts:
	composer.lock
	www/scripts/apps/admin/main/app.js
 2015-03-10 15:25:20 +01:00
Nicolas Le Goff
95243763f2 Fix thesaurus candidate terms xml creation 2015-03-10 14:36:38 +01:00
Nicolas Le Goff
ed3ffb59a6 Merge remote-tracking branch 'upstream/master' into 20150306-elastic-indexer 
Conflicts:
	bin/console
	bower.json
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Border/Manager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
	lib/classes/caption/field.php
	lib/classes/record/Interface.php
	templates/web/prod/index.html.twig
	www/skins/prod/000000/prodcolor.css
 2015-03-10 14:36:31 +01:00
Nicolas Le Goff
42a21e8e7d Merge pull request #1277 from nlegoff/locale39 
[3.9] Fix locales extraction
 2015-03-10 11:56:29 +01:00
Nicolas Le Goff
4999173467 Merge pull request #1273 from nlegoff/remove-ws 
[3.9] Remove Websockets dependencies
 2015-03-10 11:05:47 +01:00
Nicolas Le Goff
9ee42e44fe Fix locales extraction 2015-03-10 10:26:06 +01:00
Nicolas Le Goff
bd4836aaa7 Remove Websockets dependencies 2015-03-10 09:55:43 +01:00
Nicolas Le Goff
5a55732b46 Fix strict mode sql issue 2015-03-06 12:35:18 +01:00
Nicolas Le Goff
4f66588600 Add dynamic facets query 2015-02-26 12:28:22 +01:00
Nicolas Le Goff
e01c73aa83 Fix typo 2015-02-24 15:27:56 +01:00
Nicolas Le Goff
5b3e699599 Merge remote-tracking branch 'upstream/3.8' 
Conflicts:
	bower.json
	composer.lock
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineQueryParser.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Adapter.php
	lib/classes/User/Query.php
	lib/classes/patch/320alpha4b.php
	templates/web/admin/statusbit.html.twig
	templates/web/prod/actions/Tools/index.html.twig
	templates/web/prod/index.html.twig
	templates/web/prod/upload/lazaret.html.twig
	templates/web/prod/upload/upload-flash.html.twig
	www/scripts/apps/login/home/config.js
	www/skins/prod/000000/prodcolor.css
	www/skins/prod/959595/prodcolor.css
 2015-02-23 19:16:56 +01:00
Nicolas Le Goff
938a83b967 PHRAS-29 #fix Add creation story in API 2015-02-23 14:44:16 +01:00
Nicolas Le Goff
f06cb7eaec Merge pull request #1253 from kwemi/design-update-v1 
Design update
 2015-02-23 11:42:27 +01:00
Olivier Mayer
a49acb03e4 Design update 2015-02-23 15:15:55 +09:00
Nicolas Le Goff
2b96a0b238 Revert downloadble subdef api expositioon 2015-02-20 18:44:19 +01:00
Nicolas Le Goff
50165bd894 Fix record preview in production 2015-02-20 17:25:50 +01:00
Nicolas Le Goff
111755fa9b Refactor status display 2015-02-19 15:14:23 +01:00
Mathieu Darse
57f3e3dcf0 Shorten remaining flag constants and remove legacy ones 2015-02-18 19:04:10 +01:00
Jean-Yves Gaulier
41cd9c3f17 #PHRAS-325 
add parameter "adapt" to route "/embed/substitute"
fix : substituted was indicated only for thumbnails on prod/tools/recreate
 2015-02-18 18:12:11 +01:00
Nicolas Le Goff
a3ef1b606c Makes static thumbnails delivery as default delivery && set symlink dir in www directory 2015-02-16 15:01:44 +01:00