hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,516 Commits 268 Branches 107 Tags
f4428d2ff468f10c4d9b51f82bb8745ec737b6e8
Commit Graph

1149 Commits

Author SHA1 Message Date
Romain Neutron
212b09afa2 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Permalink.php
 2013-10-25 18:50:15 +02:00
Nicolas Le Goff
65147550d4 Fix input colors in IE 2013-10-24 20:14:37 +02:00
Romain Neutron
762f758705 Merge branch '3.8' 
Conflicts:
	bower.json
	lib/Alchemy/Phrasea/Controller/Prod/Feed.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/eventsmanager/notify/feed.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
 2013-10-24 14:05:04 +02:00
Romain Neutron
22b2dddcf8 Fix #1532 : Add checkbox on feed creation to disable email notifications 2013-10-22 11:09:29 +02:00
Nicolas Le Goff
6e59e7aae6 Fix #1518 Can not edit tags in metadatas settings 2013-10-21 18:39:19 +02:00
Romain Neutron
f7dfe893b4 Merge branch '3.8' 
Conflicts:
	bower.json
 2013-10-15 19:11:39 +02:00
Romain Neutron
cc75ef5ac6 Merge pull request #698 from nlegoff/fix_login_css 
[3.8] Enhance CSS for homepage customization
 2013-10-15 09:57:06 -07:00
Romain Neutron
3e03343825 Merge pull request #692 from nlegoff/fix1522 
[3.8] Fix #1522 issue with jquery ui & multiselect plugin in report
 2013-10-15 09:56:40 -07:00
Nicolas Le Goff
1d04c418cd Remove jquery multiselect plugin 2013-10-15 15:06:52 +02:00
Nicolas Le Goff
358ef398a5 Enhance login css 2013-10-15 15:02:02 +02:00
Romain Neutron
457b5ef3f0 Merge pull request #693 from nlegoff/fix1518 
[3.8] Fix #1518 Can not edit tags in metadatas settings
 2013-10-10 09:07:00 -07:00
Nicolas Le Goff
bb836ad360 Fix #1518 Can not edit tags in metadatas settings 2013-10-10 16:45:19 +02:00
Nicolas Le Goff
d4b7280c81 Fix #1522 Issue with jquery ui tabs & multiselect 2013-10-10 16:20:20 +02:00
Romain Neutron
7e8a34c599 Merge branch '3.8' 
Conflicts:
	bin/developer
	build-env.sh
	composer.json
	composer.lock
 2013-10-10 13:42:42 +02:00
Romain Neutron
f648ea296f Fix #1488 : Push / Feedback name is now mandatory 2013-10-10 13:39:07 +02:00
Nicolas Le Goff
849f6ca8ff Fix css issue on phone devices 2013-10-07 15:22:00 +02:00
Nicolas Le Goff
cde7d30a6b Sets language button text color as global text color 2013-10-07 14:26:52 +02:00
Romain Neutron
d716e91169 Merge branch '3.8' 
Conflicts:
	composer.lock
 2013-10-04 15:15:04 +02:00
Nicolas Le Goff
24a3950db9 Fix #1502 workzone content is displayed when it is closed 2013-10-03 16:48:21 +02:00
Romain Neutron
1dfbff5666 Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
	bin/developer
	lib/classes/module/console/systemUpgrade.php
	www/skins/report/jquery-ui.css
 2013-10-03 15:29:22 +02:00
Nicolas Le Goff
be02d1d7a0 Fix #1453 Edition field on firefox 2013-10-03 15:24:15 +02:00
Nicolas Le Goff
478b275f85 Enhance IE 6 management 2013-10-03 15:23:18 +02:00
Romain Neutron
5e6a6c9702 Merge pull request #663 from nlegoff/fix_1475 
[3.8] Fix #1475 Update report custom CSS & download detail
 2013-10-01 02:50:12 -07:00
Romain Neutron
e63ae364ff Merge pull request #667 from nlegoff/fix_1495 
[3.8] Fix #1495 Remove focus when editing fields
 2013-10-01 02:47:44 -07:00
Nicolas Le Goff
bfb27ddced Fix #1494 zero indexed field list 2013-10-01 11:16:56 +02:00
Nicolas Le Goff
0edc1abc9e Fix #1495 Remove focus action 2013-09-30 12:25:01 +02:00
Nicolas Le Goff
93c3a46b3c Fix #1475 Update report custom CSS 2013-09-30 11:50:29 +02:00
Nicolas Le Goff
d4045f968c Fix #1453 Edition field on firefox 2013-09-27 18:35:10 +02:00
Nicolas Le Goff
a7cfb48acc Enhance IE 6 management 2013-09-26 15:23:16 +02:00
Romain Neutron
48680fd3c3 Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
	lib/Alchemy/Phrasea/Command/Developer/ComposerInstall.php
	lib/Alchemy/Phrasea/Core/Version.php
	templates/web/setup/wrapper.html.twig
 2013-09-26 12:51:21 +02:00
Romain Neutron
f20c4cdddf Fix jquery Validation issue on setup 2013-09-25 17:24:40 +02:00
Romain Neutron
3c89f93b1b Fix #1484 : Fix jquery dialog moveToTop non working call 2013-09-24 17:41:42 +02:00
Romain Neutron
d00b39fec8 Merge branch '3.8' 2013-09-24 12:43:00 +02:00
Romain Neutron
1674565d0d Add IE6 dedicated homepage 2013-09-23 15:28:01 +02:00
Romain Neutron
0b9c8b64ac Merge branch '3.8' 2013-09-19 14:53:55 +02:00
Romain Neutron
dcf6a8abd2 Fix basket browser display 2013-09-19 11:31:11 +02:00
Romain Neutron
45c5276923 Merge branch '3.8' 2013-09-18 12:09:20 +02:00
Romain Neutron
5d9a44da27 Fix #1473 : Classic display on firefox is broken 2013-09-17 17:37:31 +02:00
Romain Neutron
8d264052aa Fix thesaurus CSS 2013-09-17 16:48:03 +02:00
Romain Neutron
0047d0fc36 Never reset date sort settings, remove date field choser 2013-09-17 16:33:48 +02:00
Romain Neutron
abbff72233 Fix #1460 : Select all value is included in the form, trigging an server side error 2013-09-14 02:10:11 +02:00
Romain Neutron
af72aaaf4b Fix #1460 : Select all value is included in the form, trigging an server side error 2013-09-10 12:58:37 +02:00
Romain Neutron
f14401b153 Merge branch '3.8' 2013-09-09 19:30:55 +02:00
Romain Neutron
68a190c8f7 Fix #1456 : Thesaurus queries don't work 2013-09-09 19:30:38 +02:00
Romain Neutron
2b5acf306e Merge pull request #632 from romainneutron/fix-1456 
[3.8] Fix #1456 : Thesaurus queries don't work
 2013-09-09 10:28:57 -07:00
Romain Neutron
90413280f3 Fix #1456 : Thesaurus queries don't work 2013-09-09 19:09:15 +02:00
Nicolas Le Goff
319c1a90c2 Remove regexp control for validating tags 2013-09-06 20:32:52 +02:00
Romain Neutron
6c29fc88e9 Merge branch '3.8' 
Conflicts:
	composer.lock
	templates/mobile/common/index.html.twig
 2013-09-05 13:57:42 +02:00
Nicolas Le Goff
ce55141917 Fix #1445 Wording & issue while moving record from collections 2013-09-05 12:04:18 +02:00
Romain Neutron
87cc0aa014 Remove execution right on images 2013-09-04 15:36:06 +02:00