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

48 Commits

Author SHA1 Message Date
Benoît Burnichon
0386d5c1e0 Update Travis conf and js testing 2015-03-26 15:35:46 +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
de5b20a4a1 Add fancytree 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
bd4836aaa7 Remove Websockets dependencies 2015-03-10 09:55:43 +01:00
Nicolas Le Goff
950cdbe5d9 Fix tests 2015-02-08 15:15:51 +01:00
Nicolas Le Goff
00d49cd74c Fix autobahn js dependency 2015-02-06 14:16:44 +01:00
Nicolas Le Goff
5da553756c Simpler deps 2015-02-05 18:56:24 +01:00
Nicolas Le Goff
24410849a5 Add base ui for facets 2015-01-05 16:08:46 +01: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
4fa1f613e4 Fix latest merge 2014-08-13 17:40:40 +02:00
Nicolas Le Goff
1645d914af Disable tinymce build 2014-06-19 16:56:09 +02:00
Nicolas Le Goff
f72d102ace Revert fetching tooltip dependency with bower 2014-03-05 15:33:23 +01:00
Nicolas Le Goff
cf2105865b Fix tests 2014-03-05 15:33:23 +01:00
Nicolas Le Goff
e5106abd0b Load sinon & sinochai from tmp assets 2014-03-05 15:33:22 +01:00
Nicolas Le Goff
c7962531fa Add jquery.treeview, jquery.tooltip as dependency trought bower 2014-03-05 15:33:21 +01:00
Nicolas Le Goff
1d8c0e86cf Add WS Connection object 2014-03-05 15:33:21 +01:00
Nicolas Le Goff
0a2d4fe04d Bind task manager backbone app to websocket using autobahn 2014-03-05 15:33:21 +01:00
Nicolas Le Goff
05d982767b Fix tinymce build 2014-03-04 14:57:10 +01:00
Nicolas Le Goff
c38c3eaa09 Remove dev dependencies from package tasks 2014-02-27 19:23:59 +01:00
Nicolas Le Goff
b3e49d68cb Fix tinymce copy task 2014-02-26 12:31:29 +01:00
Romain Neutron
ed440fa8c6 Merge pull request #962 from nlegoff/websocket-js 
[3.9] Add web-socket-js as project dependency
 2014-02-22 10:40:02 +01:00
Nicolas Le Goff
0ce9c6ebb6 Add web-socket-js as project dependency 2014-02-21 15:56:42 +01:00
Nicolas Le Goff
71e6bddc16 Add missing LICENSE 2014-02-21 15:47:19 +01:00
Nicolas Le Goff
7025e756bc Use backbone to display taskmanager front end 2014-02-14 16:55:45 +01:00
Nicolas Le Goff
9bb0d5892b Fix galleria loading 2014-02-14 12:34:33 +01:00
Nicolas Le Goff
0fa0162169 Merge pull request #950 from romainneutron/npm-packages 
[3.9] Use npm packages for build
 2014-02-13 20:03:45 +01:00
Romain Neutron
3e3a1765fa Use npm packages for build 2014-02-13 19:29:35 +01:00
Nicolas Le Goff
fe2300e6ca Fix #1639 logs error in mocha phantom js 2014-02-13 12:02:58 +01:00
Nicolas Le Goff
27f1312ef1 Add autobahn as project dependency 2014-02-06 13:08:55 +01:00
Nicolas Le Goff
f0edc0c27e Remove json3 dependency 2013-12-02 18:59:18 +01:00
Romain Neutron
38eaf7a067 Add grunt task for jquery cookie 2013-10-31 17:27:12 +01:00
Romain Neutron
3ba6183ba5 Add missing bootstrap less files for plugin installation 2013-08-26 10:20:50 +02:00
Nicolas Le Goff
ea2d99e8a5 Rename build-asset task to install-asset & add less compilation after bower install 2013-08-19 14:46:16 +02:00
Nicolas Le Goff
7eee448c57 Remove less task from grunt 2013-08-19 14:36:06 +02:00
Nicolas Le Goff
75a6f16182 Rename assets directory to tmp-asset 2013-08-19 14:36:06 +02:00
Nicolas Le Goff
fdf141b029 Fix CS 2013-08-19 14:36:06 +02:00
Nicolas Le Goff
45116154c2 Add csslint task 2013-08-19 14:36:05 +02:00
Nicolas Le Goff
779e36659b Change mocha-phantom js reporter 2013-08-19 14:36:05 +02:00
Nicolas Le Goff
20bcb94c1a Attempt to fix travis build 2013-08-19 14:36:05 +02:00
Nicolas Le Goff
a8a438d8de Add assets paths as variable 2013-08-17 17:12:58 +02:00
Nicolas Le Goff
d46583f824 Add tinymce 2013-08-17 17:12:58 +02:00
Nicolas Le Goff
01602a49f1 Add json2 2013-08-17 17:12:58 +02:00
Nicolas Le Goff
89b57730b5 Add swfobject 2013-08-17 17:12:58 +02:00
Nicolas Le Goff
4a8e1c13ab Add jquery mobile 2013-08-17 17:12:58 +02:00
Nicolas Le Goff
7d8e93bddd Fix assets path 2013-08-17 17:12:57 +02:00
Nicolas Le Goff
16d03e9a4d Add grunt test task 2013-08-17 17:12:57 +02:00
Nicolas Le Goff
74fc121fb6 Add grunt build-assets task 2013-08-17 17:12:57 +02:00