Nicolas Le Goff
|
5a55732b46
|
Fix strict mode sql issue
|
2015-03-06 12:35:18 +01:00 |
|
Nicolas Le Goff
|
6b89c123e3
|
Merge pull request #1266 from kwemi/design-update-v1
fix #7, fix #11, fix #12
|
2015-03-06 11:44:38 +01:00 |
|
Olivier Mayer
|
67873d6645
|
fix #7, fix #11, fix #12
|
2015-03-06 18:55:03 +09:00 |
|
Nicolas Le Goff
|
db7b417261
|
Merge pull request #1264 from bburnichon/feature/add-test-cleanup-script
Add test cleanup script and security advisories
|
2015-03-05 20:10:48 +01:00 |
|
Benoît Burnichon
|
d345506729
|
Add roave/security-advisories package to detect security issues.
|
2015-03-05 17:48:18 +01:00 |
|
Benoît Burnichon
|
bdf37b8040
|
Add tests/bootstrap.sh to ease cleaning databases
|
2015-03-05 17:47:31 +01:00 |
|
Nicolas Le Goff
|
17681fdb32
|
Merge pull request #1263 from bburnichon/feature/fix-build
Properly Retrieve LazaretFile repo. Update LazaretTests
|
2015-03-04 20:10:24 +01:00 |
|
Nicolas Le Goff
|
d431c16a0d
|
Merge pull request #1261 from bburnichon/feature/install-fixes
Fixup installation process
|
2015-03-04 19:35:57 +01:00 |
|
Benoît Burnichon
|
c7fb23d28c
|
Properly Retrieve LazaretFile repo. Update LazaretTests
|
2015-03-04 19:33:20 +01:00 |
|
Benoît Burnichon
|
1d6d0ab82f
|
DatabaseHelper does not try to connect twice.
|
2015-03-04 18:50:47 +01:00 |
|
Nicolas Le Goff
|
995067864c
|
Merge pull request #1262 from bburnichon/feature/run-testsuite-locally
run testsuite locally in proper vagrant box
|
2015-03-04 17:43:51 +01:00 |
|
Benoît Burnichon
|
587e89af2f
|
Change locale to use the english one.
|
2015-03-04 17:30:04 +01:00 |
|
Benoît Burnichon
|
a680e8b817
|
Add memcached and zip debian packages.
|
2015-03-04 17:29:41 +01:00 |
|
Benoît Burnichon
|
9df9c44f1d
|
Remove static-file key in Fixtures/configuration
|
2015-03-04 16:41:12 +01:00 |
|
Benoît Burnichon
|
2e74467c79
|
add vagrant dir to ignored, increase vm memory to 4G
|
2015-03-04 16:33:59 +01:00 |
|
Benoît Burnichon
|
4b48e829f7
|
Add default data path in twig
|
2015-03-03 19:03:38 +01:00 |
|
Benoît Burnichon
|
bfabecc1ad
|
Fix phraseanet install (generate ORM proxies)
|
2015-03-03 18:56:10 +01:00 |
|
Benoît Burnichon
|
b651d32a4c
|
Remove old .bowerrc copy.
|
2015-03-03 17:40:18 +01:00 |
|
Nicolas Le Goff
|
4c3f0ba959
|
Merge pull request #1260 from nlegoff/remove-flash
Remove old flash app
|
2015-03-02 14:12:27 +01:00 |
|
Nicolas Le Goff
|
143e6c25ed
|
Remove old flash app
|
2015-03-02 12:25:19 +01:00 |
|
Nicolas Le Goff
|
da835435e8
|
Merge pull request #1259 from nlegoff/bug-fixes
[3.9] Bug fixes
|
2015-02-27 18:20:47 +01:00 |
|
Nicolas Le Goff
|
709af5bba0
|
Optim
|
2015-02-27 16:09:10 +01:00 |
|
Nicolas Le Goff
|
2924d8f29f
|
Fix mount database
|
2015-02-27 16:08:53 +01:00 |
|
Nicolas Le Goff
|
95211d8875
|
Remove unused stuff
|
2015-02-27 16:08:40 +01:00 |
|
Nicolas Le Goff
|
aac3c5de5c
|
Merge pull request #1258 from kwemi/design-update-v1
980px layout
|
2015-02-24 11:53:42 +01:00 |
|
Olivier Mayer
|
e028b4c7d5
|
980px layout
|
2015-02-24 18:18:31 +09: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
|
b6f6fe3217
|
Merge pull request #1251 from nlegoff/fix-php55
[3.8.7] Fix CSV for php 5.5
|
2015-02-23 12:36:53 +01:00 |
|
Nicolas Le Goff
|
ff5a6188aa
|
Merge pull request #1252 from nlegoff/revert-315
[3.8.7] Revert PHRAS-315
|
2015-02-23 12:36:10 +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
|
f7b9e2c00c
|
Update dependencies
|
2015-02-20 18:49:31 +01:00 |
|
Nicolas Le Goff
|
2b96a0b238
|
Revert downloadble subdef api expositioon
|
2015-02-20 18:44:19 +01:00 |
|
Nicolas Le Goff
|
c6bab1182d
|
Merge pull request #1250 from kwemi/design-update-v1
Design update v1
|
2015-02-19 10:54:18 +01:00 |
|
Olivier Mayer
|
50352c0e90
|
header size
fix #5
|
2015-02-19 18:35:18 +09:00 |
|
Olivier Mayer
|
1f2d79355f
|
Result number
fix #4
|
2015-02-19 18:29:45 +09:00 |
|
Nicolas Le Goff
|
4926540267
|
Merge pull request #1249 from jygaulier/PHRAS-325
#PHRAS-325
|
2015-02-19 09:57:27 +01:00 |
|
Olivier Mayer
|
bd4bb78b59
|
Double arrow
fix #3
|
2015-02-19 17:39:36 +09:00 |
|
Olivier Mayer
|
7e26d48daf
|
Fix result padding
fix #2
|
2015-02-19 11:05:55 +09:00 |
|
Olivier Mayer
|
50ed2262ed
|
Fix broken layout
fix #1
|
2015-02-19 11:04:43 +09: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
|
a0e2ab713e
|
Merge pull request #1248 from nlegoff/step-by-step
[3.8.7] PHRAS-350 #fix add step by step tour guide
|
2015-02-18 11:09:32 +01:00 |
|
Nicolas Le Goff
|
42b4d577e5
|
Merge pull request #1247 from jygaulier/PHRAS-370
Phras 370
|
2015-02-17 19:40:09 +01:00 |
|
Jean-Yves Gaulier
|
76e046e111
|
#PHRAS-370 #time 2h
faster empty
|
2015-02-17 19:34:11 +01:00 |
|
Nicolas Le Goff
|
d9f6306f8a
|
PHRAS-350 #fix add step by step tour guide
|
2015-02-17 19:23:35 +01:00 |
|
Nicolas Le Goff
|
7aaa7c6476
|
Merge pull request #1245 from anthonycabot/templates
PHRAS-379 #fix enhance default data templates
|
2015-02-17 19:23:05 +01:00 |
|
Nicolas Le Goff
|
5a2dfc3380
|
Merge pull request #1246 from nlegoff/fix-h264-streaming
Fix H264MappingGenerator
|
2015-02-17 19:21:54 +01:00 |
|
Nicolas Le Goff
|
cff38559e1
|
Fix H264MappingGenerator
|
2015-02-17 15:27:19 +01:00 |
|
Anthony Cabot
|
6c170e1675
|
PHRAS-379 #fix enhance default data templates
|
2015-02-17 15:12:03 +01:00 |
|
Nicolas Le Goff
|
5485fc0ac4
|
Merge pull request #1243 from nlegoff/fix-374
[3.8.7] PHRAS-374 #fix command to build subdefs
|
2015-02-17 12:36:34 +01:00 |
|