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,253 Commits 268 Branches 107 Tags
9bbc36f6229a47ad522a0a057c8265cef7fb54e5
Commit Graph

41 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
Thibaud Fabre
97f2e66698 Merge 4.0 branch 2016-12-05 17:04:54 +01:00
Thibaud Fabre
b5bbb1851f Merge branch 4.0 2016-12-05 15:26:48 +01:00
Jean-Yves Gaulier
642da0fca5 PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Benoît Burnichon
38ae7bc2ac Rename get_number/set_number to getNumber/setNumber 2015-07-13 17:50:20 +02:00
Benoît Burnichon
4880f2bf5a Add getAuthenticator usage 
Replace $app['authentication']->getUser() by $app->getAuthenticatedUser()
replace twig app['authentication'].getUser() with corresponding method
 2015-07-02 12:33:18 +02:00
Florian BLOUET
a49bd0cded PHRAS-510 - fix ordering buttons for stories 2015-06-22 18:28:20 +02: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
e9e9d149a1 Locale simplification 2013-12-03 20:05:20 +01:00
Romain Neutron
e7421e1fdd Fix twig tags 2013-12-03 20:02:39 +01:00
Nicolas Le Goff
1fdf30c6af Use ACL service provider to get user's ACL 2013-11-05 12:21:42 +01:00
Romain Neutron
5c22b69d98 Fix #1338 : Fix notices display in admin 2013-07-17 13:38:30 +02:00
Romain Neutron
f9b4978569 Merge pull request #390 from romainneutron/databox-labels 
[3.8] Add labels to databoxes
 2013-06-13 07:41:05 -07:00
Romain Neutron
11a55bbd43 Add labels to databoxes 2013-06-13 09:45:43 +02:00
Romain Neutron
4161ef2e31 Use url generator everywhere 2013-06-13 09:44:16 +02:00
Romain Neutron
c084f20f85 Labelize collections 2013-06-01 01:29:07 +02:00
Romain Neutron
d2bc4f4a23 Add AuthenticationServiceProvider 2013-05-29 14:22:50 +02:00
Romain Neutron
284f281958 Remove user var from templates 2012-10-04 15:43:36 +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
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
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
1426b9a6f9 Add feedback availability from basket + User icons 2012-03-05 16:08:49 +01:00
Romain Neutron
906a26d11d Fix Basket/Story sorting 2012-02-23 14:47:56 +01:00
Romain Neutron
cae82aca00 Fix story creation bug 2012-02-08 17:24:01 +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
ae4ac2b911 Fix javascript typo 2011-12-27 19:13:29 +01:00
Romain Neutron
d10aa10424 Refactor basket_adapter 2011-12-26 10:48:44 +01:00
Romain Neutron
c215bb2f9f Story Create template 2011-12-21 17:41:09 +01:00