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

38 Commits

Author SHA1 Message Date
Nicolas Le Goff
28eecf6a09 Merge branch '3.8' 
Conflicts:
	.gitignore
	bin/console
	composer.json
	composer.lock
	hudson/fixtures.sql
	lib/Alchemy/Phrasea/Command/Developer/IniReset.php
	lib/Alchemy/Phrasea/Command/Setup/Install.php
	lib/Alchemy/Phrasea/Controller/Api/Oauth2.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
	lib/Alchemy/Phrasea/Helper/Prod.php
	lib/classes/API/OAuth2/Application.php
	lib/classes/API/V1/Interface.php
	lib/classes/API/V1/adapter.php
	lib/classes/Setup/Upgrade.php
	lib/classes/media/subdef.php
	lib/classes/task/period/RecordMover.php
	templates/web/prod/index.html.twig
	templates/web/setup/step2.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Admin/RootTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/db-ref.sqlite
	vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup
 2014-10-09 19:40:33 +02:00
Nicolas Le Goff
bd952552d5 PHRAS-192 #fix separator display in edit box 2014-09-09 21:14:36 +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
c38c3eaa09 Remove dev dependencies from package tasks 2014-02-27 19:23:59 +01:00
Romain Neutron
3cf2cbd6f1 Merge branch '3.8' 2013-11-12 13:26:15 +01:00
Romain Neutron
9fa95db23c Fix JS codestyle 2013-11-12 12:49:23 +01:00
Romain Neutron
89fb774f96 Merge branch '3.8' 2013-11-12 12:10:40 +01:00
Romain Neutron
dc5c12a592 Fix JS code style 2013-11-11 11:25:52 +01:00
Nicolas Le Goff
e92c165564 Fix typo 2013-08-19 14:51:54 +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
764fa42f14 Update to jquery ui 1.10.3 
Fix conflict & ui bugs

Remove debug
 2013-06-21 13:46:16 +02:00
Romain Neutron
bfa28e0fd0 Bump to jquery ui 1.8.24, fix JS and CSS load issues 2013-06-13 13:52:03 +02:00
Nicolas Le Goff
cbd8236e91 Fix Upload tests 2013-05-31 13:03:25 +02:00
Nicolas Le Goff
acb66d6f92 Fix #1190 Use phantom JS to run qunit tests 2013-05-31 12:47:31 +02:00
Romain Neutron
769f319638 Update templates to display databox fields labels 2013-05-30 18:12:31 +02:00
Romain Neutron
8fd865ec13 Remove prod directory 2013-05-29 14:23:00 +02:00
Romain Neutron
08aba20777 Fix qunit.css path 2013-05-29 14:23:00 +02:00
Romain Neutron
3638385b58 Move minify to dedicated controller, www directory cleanup 2013-05-24 14:37:55 +02:00
Nicolas Le Goff
e0a874c2f1 fix #633 Javascript jquery.upload fails 2012-05-25 21:10:11 +02:00
Nicolas Le Goff
ce4786022a add upload library 2012-05-21 21:08:39 +02:00
Romain Neutron
6a4708bee5 Add debug line 2012-04-20 11:13:13 +02:00
Romain Neutron
96080dfd1a Fix reorder box selection 2012-04-10 14:08:01 +02:00
Romain Neutron
2412c41553 GFix client publications 2012-02-28 16:02:58 +01:00
Romain Neutron
6ba0bbe64d Trig selectStop event on select method end 2012-02-17 17:25:59 +01:00
Romain Neutron
400db81f28 Add notification for editing search / replace 2012-02-16 18:59:08 +01:00
Romain Neutron
3e77f99329 Add limit and custom auto-selector 2012-02-16 18:02:08 +01:00
Romain Neutron
9b9026b173 Add method to check vocabulary / export datas 2012-02-08 16:09:57 +01:00
Romain Neutron
7faa578704 Fix list saving 2012-02-03 01:25:36 +01:00
Romain Neutron
a9c0740b3a Push javascript 2012-01-31 22:05:18 +01:00
Romain Neutron
a4d3e6388e Fix Js errors 2012-01-24 15:47:12 +01:00
Romain Neutron
16bb162f5d Editing template 2012-01-23 12:26:33 +01:00
Romain Neutron
f4e03610cc Jquery edit enhancements 2012-01-20 18:48:04 +01:00
Romain Neutron
22559b0474 Jquery edit javascript 2012-01-20 15:25:07 +01:00
Romain Neutron
51ed30621d Add jquery.Edit.recordField JS object 2012-01-19 17:54:10 +01:00
Romain Neutron
99ca258c1c Removed some console.log 2012-01-10 20:29:21 +01:00
Romain Neutron
458dc822ec Selection is active on click, not mousedown 2011-12-27 19:18:11 +01:00
Romain Neutron
f61a96996a Prod JS 2011-12-26 12:16:20 +01:00