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

6605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Neutron
d157b95e95 Merge pull request #730 from romainneutron/configuration-cache 
[3.8] Add cache to configuration
 2013-10-29 09:56:07 -07:00
Romain Neutron
0446dc29fc Add cache to configuration 2013-10-29 17:55:49 +01:00
Romain Neutron
072bd8f5fc Merge branch '3.8' 2013-10-29 17:44:26 +01:00
Romain Neutron
de9d3b5fec Merge pull request #732 from jygaulier/3.8-fix1553 
fix #1553
 2013-10-29 09:43:26 -07:00
Romain Neutron
19d45863b9 Move doctrine logger to Phrasea namespace 2013-10-29 17:35:34 +01:00
Romain Neutron
08ce909730 Move doctrine repositories to Phrasea namespace 2013-10-29 17:30:11 +01:00
jygaulier
3b2b72d681 fix #1553 2013-10-29 17:11:22 +01:00
Romain Neutron
910850396c Move doctrine types to Phrasea namespace 2013-10-29 17:05:20 +01:00
Romain Neutron
18251456e4 Move doctrine proxies to Phrasea namespace 2013-10-29 17:00:32 +01:00
Romain Neutron
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01:00
Romain Neutron
ad18b2a3fb Merge pull request #697 from romainneutron/order-patch 
[3.9] Add missing patch for orders
 2013-10-29 07:15:32 -07:00
Romain Neutron
972ab94944 Add missing patch for orders 2013-10-29 12:31:35 +01:00
Romain Neutron
2dcbd2f985 Fix latest merge 2013-10-29 12:18:44 +01:00
Romain Neutron
09344f4703 Merge branch '3.8' 2013-10-29 10:32:10 +01:00
Romain Neutron
ce8bdf3b9a Merge pull request #727 from romainneutron/fix-doctrine-patch 
[3.8] Fix doctrine transaction in lazaret patch
 2013-10-29 02:31:06 -07:00
Romain Neutron
ebe4f00c6b Fix doctrine transaction in lazaret patch 2013-10-28 23:20:42 +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
fd3bd29fd2 Merge pull request #590 from nlegoff/usermanager 
[3.9] User management
 2013-10-28 10:08:52 -07:00
Nicolas Le Goff
b45bc31135 Adress comments 2013-10-28 15:53:00 +01:00
Romain Neutron
9d69c8dc3f Use Twig 1.13, waiting for bug #1251 to be solved 2013-10-28 15:24:03 +01:00
Romain Neutron
0086a9d90f Merge pull request #719 from nlegoff/fix_asset_plugin 
[3.8] Register plugin_asset twig function
 2013-10-28 05:42:35 -07:00
Romain Neutron
f12eae664f Merge pull request #725 from romainneutron/fix-1545 
[3.8] Sanitize XML data
 2013-10-28 05:42:01 -07:00
Romain Neutron
b09d04c759 Merge pull request #726 from romainneutron/add-missing-file 
[3.9] Add missing feed item repository test
 2013-10-28 05:41:32 -07:00
Nicolas Le Goff
d5ff2f03e4 Rename ModelServiceProvider to ManipulatorServiceProvider 2013-10-28 12:57:05 +01:00
Nicolas Le Goff
9737a758d6 Remove user adapter interface 2013-10-28 12:57:05 +01:00
Nicolas Le Goff
23a5a1992e Fix tests 2013-10-28 12:57:05 +01:00
Nicolas Le Goff
6259bef58c Regenerate SQLite Database 2013-10-28 12:57:05 +01:00
Nicolas Le Goff
297f23dc06 Addressed romainneutron comments 2013-10-28 12:57:05 +01:00
Nicolas Le Goff
4eb7243120 Add UsrId property 2013-10-28 12:57:04 +01:00
Nicolas Le Goff
1f03451bfc Add user manager & user manipulator 2013-10-28 12:57:04 +01:00
Romain Neutron
f4428d2ff4 Fix build 2013-10-28 12:45:16 +01:00
Nicolas Le Goff
c5c75ceb2f Registe plugin_asset twig function 2013-10-28 12:44:29 +01:00
Romain Neutron
18d1667598 Sanitize XML data 2013-10-28 12:36:39 +01:00
Romain Neutron
3382fed370 Add missing feed item repository test 2013-10-28 12:22:23 +01:00
Romain Neutron
aa95bfdba2 Merge pull request #715 from romainneutron/fix-1550 
[3.8] Fix #1550 : Remove feed entry items that are not related to a record
 2013-10-25 10:05:09 -07: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
da60ce8a40 Merge pull request #724 from nlegoff/remove_index_sorter 
[3.8] Ensure sorter index is removed
 2013-10-25 10:01:14 -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
35e9e692d2 Fix ACL cache issue 2013-10-25 18:47:26 +02:00
Romain Neutron
ffb9ac73d0 Fix #1550 : Remove feed entry items that are not related to a record 2013-10-25 17:58:27 +02:00
Romain Neutron
5e386a48d1 Fix #1538 : Email are not sent anymore 2013-10-25 17:57:01 +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
ab59e14b1a Merge pull request #720 from romainneutron/fix-1546 
[3.8] Fix #1546 : Disallow push when records can not be pushed
 2013-10-25 08:37:23 -07:00
Romain Neutron
5e6399a501 Merge pull request #718 from romainneutron/fix-1547 
[3.8] Fix #1549 : recognize IE11
 2013-10-25 08:36:51 -07:00
Romain Neutron
07a6cf56ba Merge pull request #717 from romainneutron/fix-1549 
[3.8] Fix #1549 : Fix wording
 2013-10-25 08:36:37 -07:00
Nicolas Le Goff
92bc9c0d39 Ensure sorter index is removed 2013-10-25 16:59:27 +02:00
Romain Neutron
74fd7988bb Merge pull request #716 from romainneutron/fix-acl-cache 
[3.8] Fix ACL cache issue
 2013-10-25 07:13:24 -07:00
Romain Neutron
415769e3e5 Merge pull request #714 from romainneutron/fix-access 
[3.8] Fix thumbnail access
 2013-10-25 07:12:59 -07:00
Romain Neutron
8b510031a0 Fix #1544 : Upgrade data command fails 2013-10-25 16:02:53 +02:00
Romain Neutron
1b1c1ae877 Fix #1546 : Disallow push when records can not be pushed 2013-10-25 15:54:29 +02:00