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

2018 Commits

Author SHA1 Message Date
Romain Neutron
f4428d2ff4 Fix build 2013-10-28 12:45:16 +01: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
6a53038803 Merge pull request #721 from romainneutron/fix-1544 
[3.8] Fix #1544 : Upgrade data command fails
 2013-10-25 08:44:16 -07:00
Romain Neutron
8b510031a0 Fix #1544 : Upgrade data command fails 2013-10-25 16:02:53 +02:00
Romain Neutron
e636d2ab32 Fix thumbnail access 2013-10-25 13:51:38 +02:00
Romain Neutron
fafe2dca0f Fix latest merge 2013-10-25 13:47:35 +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
3633c1a926 Fix #1531 : Allow preview access on public feed entry items 2013-10-22 12:44:14 +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
Nicolas Le Goff
187aa620cf Add login template variable to get last published items 2013-10-21 16:42:36 +02:00
Romain Neutron
f7dfe893b4 Merge branch '3.8' 
Conflicts:
	bower.json
 2013-10-15 19:11:39 +02:00
Romain Neutron
989c1b80e8 Merge pull request #689 from romainneutron/fix-1528 
[3.8] Fix #1528 : Allow collection order only on available collections
 2013-10-15 05:57:36 -07:00
Romain Neutron
92fe657e80 Fix #1528 : Restrict collection ordering on available collections 2013-10-15 14:14:44 +02:00
Romain Neutron
b7d8f777fd Merge pull request #694 from romainneutron/fix-1535 
[3.8] Fix #1535 : API does not display search engine suggestions correctly
 2013-10-15 04:05:30 -07:00
Romain Neutron
1551d03f95 Merge pull request #686 from romainneutron/fix-1527 
[3.8] Fix #1527 : Wrong offset for classic query result
 2013-10-10 09:09:43 -07:00
Romain Neutron
eca23ce8c1 Merge pull request #688 from romainneutron/fix-1520 
[3.8] Fix #1520 : Avoid fatal error while editing from multiple databoxes
 2013-10-10 09:03:04 -07:00
Romain Neutron
eb6eb689e0 Fix #1535 : API does not display search engine suggestions correctly 2013-10-10 18:00:09 +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
9e916a8fcc Fix #1527 : Wrong offset for classic query result 2013-10-10 13:40:10 +02:00
Romain Neutron
5538a6924c Fix #1520 : Avoid fatal error while editing from multiple databoxes 2013-10-10 13:39:47 +02:00
Romain Neutron
f648ea296f Fix #1488 : Push / Feedback name is now mandatory 2013-10-10 13:39:07 +02:00
Romain Neutron
5996e590bc Reset exiftool writer before writing 2013-10-09 12:18:16 +02:00
Nicolas Le Goff
2b7ecdd0a0 Add Phraseanet namespace for twig templates 2013-10-07 14:26:50 +02:00
Romain Neutron
6345fcc83a Add uninstaller for development purposes 2013-10-07 10:08:11 +02:00
Romain Neutron
0a950b0ae6 Add uninstaller for development purposes 2013-10-04 17:29:13 +02:00
Romain Neutron
d716e91169 Merge branch '3.8' 
Conflicts:
	composer.lock
 2013-10-04 15:15:04 +02:00
Nicolas Le Goff
9fc8fbc194 Fix API password grant type authentication 2013-10-03 17:12:46 +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
Romain Neutron
0236f927cc Merge pull request #674 from romainneutron/fix-1401 
[3.8] Fix 1401 Bump video max bitrate to 12000
 2013-10-03 06:17:16 -07:00
Romain Neutron
7fc1999883 Merge pull request #675 from romainneutron/fix-1506 
[3.8] Fix 1506 Avoid query error in case search engine index is broken
 2013-10-03 06:17:05 -07:00
Romain Neutron
4501f2ac8f Fix #1503 : Avoid query error in case search engine index is broken 2013-10-02 19:30:59 +02:00
Romain Neutron
f638343de1 Fix #1506 : Install data path is not saved 2013-10-02 19:30:36 +02:00
Romain Neutron
255f66968f Bump video max bitrate to 12000 2013-10-02 18:34:57 +02:00
Romain Neutron
fba9da7daa Open up controller API to allow better pluginification 2013-10-02 13:59:22 +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
eb590780ca Fix CS 2013-09-30 18:26:32 +02:00
Romain Neutron
15e7b3aa1a Bower installer simplification 2013-09-30 14:32:26 +02:00
Nicolas Le Goff
93c3a46b3c Fix #1475 Update report custom CSS 2013-09-30 11:50:29 +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
9d3b21238c Prepare version 3.8 2013-09-25 21:42:27 +02:00
Romain Neutron
60e2e94cae Merge pull request #660 from romainneutron/fix-1487 
[3.8] Fix #1487 : Fix feedback request messages
 2013-09-25 02:52:52 -07:00
Romain Neutron
d7076cd441 Allow failure on composer self-update 2013-09-25 11:49:25 +02:00
Romain Neutron
c33b325666 Fix #1487 : Fix feedback request messages 2013-09-25 11:01:21 +02:00
Romain Neutron
d00b39fec8 Merge branch '3.8' 2013-09-24 12:43:00 +02:00
Romain Neutron
b96c7e8622 Remove chrome frame toggler 2013-09-23 14:11:58 +02:00
Romain Neutron
aa2b2c11c4 Merge branch '3.8' 2013-09-19 15:10:54 +02:00
Romain Neutron
fac302dcbd Fix #1479 : Add validation duration in mail body 2013-09-19 14:39:16 +02:00
Romain Neutron
45c5276923 Merge branch '3.8' 2013-09-18 12:09:20 +02:00