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

1263 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
Romain Neutron
1b1c1ae877 Fix #1546 : Disallow push when records can not be pushed 2013-10-25 15:54:29 +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
3ea4da0386 Merge pull request #708 from nlegoff/galleria 
[3.8] Enhance homepage customization
 2013-10-22 03:11:08 -07:00
Nicolas Le Goff
66facbabea Add Bootstrap Carousel & Galleria as homepage presentation mode 2013-10-22 11:27:40 +02:00
Romain Neutron
22b2dddcf8 Fix #1532 : Add checkbox on feed creation to disable email notifications 2013-10-22 11:09:29 +02:00
Romain Neutron
a805c94524 Merge branch '3.8' 
Conflicts:
	composer.json
	composer.lock
	lib/classes/task/Scheduler.php
 2013-10-21 19:05:37 +02:00
Romain Neutron
0c8c175ab5 Merge pull request #706 from nlegoff/fix_1497 
[3.8] Fix #1497 Resizing images is not working on tablet in paysage mode
 2013-10-18 08:32:04 -07:00
Nicolas Le Goff
f9cd105e51 Fix #1497 Resizing images is not working on tablet in paysage mode 2013-10-18 16:11:54 +02:00
Romain Neutron
0fa375b9bc Merge branch '3.8' 
Conflicts:
	composer.json
	composer.lock
	lib/classes/task/Scheduler.php
 2013-10-18 15:01:47 +02:00
Romain Neutron
922653deb4 Merge pull request #702 from romainneutron/fix-1537 
Fix #1537 : SearchEngine collection filter does not work in classic
 2013-10-17 04:59:15 -07:00
Romain Neutron
51b0ca05df Fix #1537 : SearchEngine collection filter does not work in classic 2013-10-17 11:58:38 +02:00
Nicolas Le Goff
af2fdc1eac Fix1539 2013-10-16 19:09:20 +02:00
Romain Neutron
f7dfe893b4 Merge branch '3.8' 
Conflicts:
	bower.json
 2013-10-15 19:11:39 +02: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
Romain Neutron
92fe657e80 Fix #1528 : Restrict collection ordering on available collections 2013-10-15 14:14:44 +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
Nicolas Le Goff
2d632b335c Add a new 'container' block 2013-10-07 14:26:51 +02:00
Nicolas Le Goff
daa7a9be58 Remove bold balise from template 2013-10-07 14:26:51 +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
478b275f85 Enhance IE 6 management 2013-10-03 15:23:18 +02:00
Romain Neutron
3c4b3868ec Merge pull request #679 from nlegoff/fix_1509 
[3.8] Fix #1509 missing label for stories status edition
 2013-10-03 06:16:31 -07:00
Nicolas Le Goff
2a1c421110 fix #1509 Fix missing label for stories status edition 2013-10-03 12:20:27 +02:00
Romain Neutron
d6d3ffa243 Fix #1510 : Fix API application status display 2013-10-03 12:20:02 +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
Nicolas Le Goff
93c3a46b3c Fix #1475 Update report custom CSS 2013-09-30 11:50:29 +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
9382e121b5 Fix #1486 : Add 3 missing locales 2013-09-25 10:59:22 +02:00
Romain Neutron
d00b39fec8 Merge branch '3.8' 2013-09-24 12:43:00 +02:00
Romain Neutron
49092c5d63 Add translation, remove confitional comments in cooliris display 2013-09-24 11:12:53 +02:00
Romain Neutron
134ed0b5ab Disable cooliris on IE 6 2013-09-23 15:29:29 +02:00
Romain Neutron
1674565d0d Add IE6 dedicated homepage 2013-09-23 15:28:01 +02:00
Romain Neutron
b96c7e8622 Remove chrome frame toggler 2013-09-23 14:11:58 +02:00
Romain Neutron
45c5276923 Merge branch '3.8' 2013-09-18 12:09:20 +02:00
Romain Neutron
756f6095a7 Minor report updates 2013-09-18 12:07:07 +02:00
Romain Neutron
1181d756e3 Merge pull request #648 from romainneutron/stemm-search 
[3.8] Add disable toggle on Phraseanet
 2013-09-17 08:38:40 -07:00
Romain Neutron
a013b8d9e1 Merge pull request #641 from romainneutron/upgrade-instructions 
[3.8] Remove infinite redirection, add upgrade instructions
 2013-09-17 08:06:48 -07:00
Romain Neutron
219156bf8e Add SearchEngineInterface::isStemmingEnabled 2013-09-17 17:03:41 +02:00
Romain Neutron
42dea4de88 Merge pull request #647 from romainneutron/fix-1468 
[3.8] Fix suggested values editing
 2013-09-17 07:37:32 -07:00
Romain Neutron
4ce8bdeaf8 Fix suggested values editing 2013-09-17 16:36:22 +02:00
Romain Neutron
0e75a28d54 Merge pull request #643 from romainneutron/fix-1467 
[3.8] Never reset date sort settings, remove date field choser
 2013-09-17 07:34:38 -07:00
Romain Neutron
0047d0fc36 Never reset date sort settings, remove date field choser 2013-09-17 16:33:48 +02:00
Romain Neutron
58d920cb02 Simulate realtime db update 2013-09-17 16:30:41 +02:00
Romain Neutron
b81f894d22 Remove infinite redirection, add upgrade instructions 2013-09-17 16:28:23 +02:00
Romain Neutron
0d3aaf362d Merge branch 'feeds-entities' of https://github.com/csaoh/Phraseanet 2013-09-12 13:53:56 +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