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

45 Commits

Author SHA1 Message Date
Arthur de Moulins
d41268ea66 arrange volumes 2020-02-28 15:56:16 +01:00
Arthur de Moulins
924b7d1b8e merge phraseanet-docker repo to this one 2020-02-28 09:41:58 +01:00
aina-esokia
3c4046b432 commit doctrine proxies files 2019-05-21 18:07:41 +04:00
Arthur de Moulins
25aeb9d73a PHRAS-2494 keep node_modules directory for performance 2019-03-27 17:23:44 +01:00
Thibaud Fabre
bfcfa591da Split make targets and update provisioning accordingly 2016-09-22 11:51:54 +02:00
Thibaud Fabre
4da8a25e26 Fix Ansible roles to provision fully functional Vagrant VM 2016-09-21 16:49:15 +02:00
Benoît Burnichon
e45530a0e2 Add PimpleContainerDump helper 2015-12-22 14:24:32 +01:00
Florian BLOUET
261339ecd5 remove recess, bower, grunt and uglifyJs dependencies in php utils and tests 
updated minifier tests
 2015-12-02 17:36:37 +01:00
Florian BLOUET
285edaf504 wip - refactoring frontend dependency and build tools - removed deprecated features (client interface) 2015-12-02 17:35:36 +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
Benoît Burnichon
2e74467c79 add vagrant dir to ignored, increase vm memory to 4G 2015-03-04 16:33:59 +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
Mathieu Darse
5b24664001 Merge branch 'master' into elastic-indexer 
Conflicts:
	bin/console
 2014-10-15 12:18:44 +02:00
Nicolas Le Goff
10a83bc6c4 Fix latest merge 2014-10-13 12:58:20 +02:00
Damien Alexandre
1b8ae26c64 Improve jison script, run the update parser 2014-09-22 16:58:50 +02:00
Nicolas Le Goff
7eb1a506fa Merge branch '3.8' 
Conflicts:
	.gitignore
	.travis.yml
	Vagrantfile
	lib/Alchemy/Phrasea/Controller/Datafiles.php
	lib/Alchemy/Phrasea/Controller/Setup.php
	lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
	lib/classes/connection/pdo.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.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/setup/step2.html.twig
	vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup
	vagrant/vms/phraseanet-php54-nginx/puphpet/shell/important-notices.txt
	vagrant/vms/phraseanet-php54-nginx/puphpet/shell/self-promotion.txt
 2014-09-09 15:05:13 +02:00
Damien Alexandre
ab07cb8e17 Merge branch 'master' into elastic-indexer 
Conflicts:
	.gitignore
 2014-09-08 11:39:02 +02:00
Nicolas Le Goff
de7988689e Update directory structure & allow to configure paths (tmp, log, cache) 2014-09-05 15:57:00 +02:00
Nicolas Le Goff
3202c3eb9d Add gitignore rules 2014-09-04 19:42:51 +02:00
Nicolas Le Goff
b9bb9f5f0e Merge branch '3.8' 
Conflicts:
	.gitignore
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/databox.php
	lib/classes/task/abstract.php
	lib/classes/task/manager.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.php
	lib/conf.d/bases_structure.xml
	templates/web/admin/tasks/list.html.twig
 2014-08-26 13:38:01 +02:00
Mathieu Darse
6630d67d95 Ignore vagrant hidden files & binaries from Composer 2014-08-25 10:27:25 +02:00
Nicolas Le Goff
bc88d0f474 Add crossdomain file generator command 2014-08-19 16:35:57 +02:00
Nicolas Le Goff
a729c63825 Add ignore rule 2014-03-05 15:33:23 +01:00
Romain Neutron
d974da8be1 Remove user specific files from gitignore 2013-11-13 17:55:31 +01:00
Nicolas Le Goff
75a6f16182 Rename assets directory to tmp-asset 2013-08-19 14:36:06 +02:00
Nicolas Le Goff
a963f0926d Remove skins/build path 2013-08-17 17:12:58 +02:00
Nicolas Le Goff
74fc121fb6 Add grunt build-assets task 2013-08-17 17:12:57 +02:00
Nicolas Le Goff
f6e9e227f8 Install npm package locally 2013-08-08 18:23:23 +02:00
Nicolas Le Goff
669ad3690b Update ignore rules 2013-06-11 19:09:35 +02:00
Romain Neutron
3601fddbb9 Add plugins directory to gitignore 2013-05-31 11:37:02 +02:00
Nicolas Le Goff
dcd472ee82 Fix asset build path 2013-05-29 14:23:15 +02:00
Nicolas Le Goff
e602c9bf54 Move CSS builded by less into a specific directory 2013-05-29 14:23:15 +02:00
Nicolas Le Goff
344564e150 Add behat.yml to gitignore 2013-05-29 14:23:07 +02:00
Nicolas Le Goff
c7f30521ce Add ignore rules 2013-05-29 14:22:54 +02:00
Romain Neutron
dfb63f5a49 Add bower assets directory to gitignore 2013-02-25 16:25:40 +01:00
Nicolas Le Goff
fdec06c1e1 add /login/register/ 2012-07-20 17:36:25 +02:00
Romain Neutron
826f372fcc Update gitignore 2012-07-18 19:14:34 +02:00
Romain Neutron
7904445070 Update gitignore 2012-05-23 19:26:18 +02:00
Romain Neutron
03cdccc854 Cleanup gitignore 2012-05-22 20:00:14 +02:00
Romain Neutron
fb02cbb684 Use Composer for dependencies instead of git submodules 2012-03-30 13:40:23 +02:00
Romain Neutron
f7cc2702e2 Add notifications to feed entries 2012-03-09 15:59:04 +01:00
Ysolyne Gresille
e559ca6520 Add DS_Store to gitignore 2012-03-08 17:42:04 +01:00
Ysolyne Gresille
21c18422f7 Add DS_Store to gitignore 2012-02-22 11:23:10 +01:00
Romain Neutron
a709129824 Merge with master 2012-01-05 14:56:13 +01:00
Romain Neutron
2b1d8e07d1 added gitignore 2011-12-07 17:13:04 +01:00