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
14,537 Commits 268 Branches 107 Tags
4d5247aa704b190db3bb5e238b7ca3b7cf86d0be
Commit Graph

42 Commits

Author SHA1 Message Date
Mike Ng
30f49bdd35 resolve conflict 2018-01-08 15:57:13 +04:00
Mike Ng
e7d3a5c405 porting PHRAS-179 to 4.1 2018-01-04 12:33:31 +04:00
Florian BLOUET
ea3abbeb54 wip: remove prod js modules dependencies 2016-03-18 10:08:08 +01:00
Florian BLOUET
ab368a7dee wip: js modularization of lightbox and cleanup 2016-03-18 10:08:07 +01:00
Florian BLOUET
5eec250624 modularize dialog Module (no more p4.dialog) 2016-03-18 10:08:07 +01:00
Florian Blouet
05f3878408 PHRAS-885 - fix basket rename form submission event 2016-02-18 08:43:46 +01:00
Nicolas Le Goff
3565d1c795 Merge branch '3.8' into fix-latest-merge 
Conflicts:
	CHANGELOG.md
	bower.json
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Media/Subdef/Image.php
	lib/conf.d/_GV_template.inc
	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
	templates/web/prod/Story/Reorder.html.twig
	templates/web/prod/WorkZone/Macros.html.twig
	templates/web/prod/actions/Download/prepare.html.twig
	templates/web/prod/templates/push.html.twig
 2014-07-11 17:19:39 +02:00
Nicolas Le Goff
a04ed200b6 Fix record title display in reorder grid for basket & story 2014-07-09 10:57:18 +02:00
Romain Neutron
c0919fbdc9 Merge branch '3.8' 2014-01-23 08:28:14 +01:00
Nicolas Le Goff
48389a4e8e Fix #1659 reorder feature is broken for baskets & stories 2014-01-21 14:56:05 +01:00
Romain Neutron
e7421e1fdd Fix twig tags 2013-12-03 20:02:39 +01:00
Romain Neutron
f519d3e8b8 Fix route generation parameters 2013-12-03 19:41:25 +01:00
Romain Neutron
4f31cfeefc Merge branch '3.8' 
Conflicts:
	bower.json
	templates/web/common/index_bootstrap.html.twig
	templates/web/common/menubar.html.twig
	templates/web/login/layout/base-layout.html.twig
	templates/web/prod/Baskets/Reorder.html.twig
 2013-12-02 18:17:38 +01:00
Nicolas Le Goff
52a8d9672c Fix #1584 Unable to order medias 
Conflicts:
	templates/web/prod/Baskets/Reorder.html.twig
 2013-11-27 12:09:55 +01:00
Romain Neutron
3548421160 Add basket converter 2013-11-13 17:52:12 +01:00
Romain Neutron
5c22b69d98 Fix #1338 : Fix notices display in admin 2013-07-17 13:38:30 +02:00
Nicolas Le Goff
a4fb3d958b Fix #788 Add a default basket 2013-06-17 17:20:14 +02:00
Romain Neutron
4161ef2e31 Use url generator everywhere 2013-06-13 09:44:16 +02:00
Romain Neutron
ec11550eab Update templates 2012-10-04 15:42:53 +02:00
Romain Neutron
ba25b8cc7c Merge with 3.7 2012-10-04 12:49:01 +02:00
Romain Neutron
6c1054420f Use lazyload as fallback 2012-10-01 15:06:10 +02:00
Romain Neutron
63e554519c Update templates 2012-07-24 13:12:23 +02:00
Nicolas Le Goff
48ada23da4 fix #747 Rename a basket reload all production application 2012-06-22 19:02:13 +02:00
Romain Neutron
bf99879c97 Fix label reference 2012-06-22 16:51:19 +02:00
Ysolyne Gresille
316941309d view bugfixes + update skins for Bridge 2012-06-04 19:14:10 +02:00
Nicolas Le Goff
5665d6b035 fix #684, #683, #681, #680, #676, #675, #674, #673, #672, #669, #668, #667 2012-06-01 12:29:54 +02:00
Ysolyne Gresille
1fff1faa5d bugfixes et updates for skins 2012-05-29 18:27:14 +02:00
Nicolas Le Goff
9d9c6ffa88 fix #655 fix validate button position 
fix #656 fix reorder basket
 2012-05-25 21:10:13 +02:00
Romain Neutron
96080dfd1a Fix reorder box selection 2012-04-10 14:08:01 +02:00
Romain Neutron
82d9eeef7b Coding standards 2012-03-09 12:49:13 +01:00
Romain Neutron
906a26d11d Fix Basket/Story sorting 2012-02-23 14:47:56 +01:00
Romain Neutron
a3dc2062ee Coding standards 2012-02-06 13:25:06 +01:00
Romain Neutron
cf8129919d Refactor jquery dialogs 2012-02-03 18:12:13 +01:00
Romain Neutron
38dbf4b4b9 Use of new Dialog.js 2012-02-03 15:46:16 +01:00
Romain Neutron
06b8df26b1 Fix coding standards 2012-01-26 12:32:37 +01:00
Romain Neutron
9f5eae01dc Modify Selectable use 2012-01-25 11:25:52 +01:00
Romain Neutron
ff7a5d2128 Basket refactor 2011-12-27 19:17:36 +01:00
Romain Neutron
d10aa10424 Refactor basket_adapter 2011-12-26 10:48:44 +01:00
Romain Neutron
9a519b9361 Baskets templates 2011-12-21 17:40:54 +01:00
Romain Neutron
8b6278cb2a Basket route 2011-12-19 19:08:44 +01:00
Romain Neutron
294c97f4f4 Basket templates 2011-12-19 17:41:33 +01:00
Romain Neutron
5941c25ae6 Refactor 2011-12-16 20:00:59 +01:00