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,605 Commits 268 Branches 107 Tags
12727e20a7f3b0b51b6d0763705835d4da66cea7
Commit Graph

1280 Commits

Author SHA1 Message Date
Romain Neutron
fafc7c334c Use Job Id instead of classname in DB 2013-10-29 18:42:46 +01:00
Romain Neutron
156ec3dc6d Fix templates 2013-10-29 18:41:44 +01:00
Romain Neutron
d2c7b00298 Add task log template 2013-10-29 18:41:44 +01:00
Romain Neutron
8abc87f084 Fix menubar in case no modules are defined 2013-10-29 18:41:44 +01:00
Romain Neutron
865e89bf64 Update templates 2013-10-29 18:41:43 +01:00
Romain Neutron
9ef3c22df2 Add RecordMover job 2013-10-29 18:41:41 +01:00
Romain Neutron
fd55f15f93 Add Archive task 2013-10-29 18:41:41 +01:00
Romain Neutron
ae891151d1 Add Phraseanet Indexer job 2013-10-29 18:41:41 +01:00
Romain Neutron
14b3a39ca2 Add FtpPull job 2013-10-29 18:41:40 +01:00
Romain Neutron
e57e11de8e Add Subdefs job 2013-10-29 18:41:40 +01:00
Romain Neutron
c319bce1fe Add WriteMetadata job 2013-10-29 18:41:40 +01:00
Romain Neutron
c2ac476240 Add Ftp job 2013-10-29 18:41:40 +01:00
Romain Neutron
08ce909730 Move doctrine repositories to Phrasea namespace 2013-10-29 17:30:11 +01:00
Romain Neutron
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01:00
Romain Neutron
96ac795d8d Merge branch '3.8' 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/classes/Feed/Entry/Item.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
 2013-10-28 18:21:15 +01:00
Romain Neutron
34ee0cd507 Merge pull request #722 from romainneutron/fix-1538 
[3.8] Fix #1538 : Email are not sent anymore
 2013-10-25 10:03:50 -07:00
Romain Neutron
212b09afa2 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Permalink.php
 2013-10-25 18:50:15 +02:00
Romain Neutron
5e386a48d1 Fix #1538 : Email are not sent anymore 2013-10-25 17:57:01 +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