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

3922 Commits

Author SHA1 Message Date
Romain Neutron
0d3aaf362d Merge branch 'feeds-entities' of https://github.com/csaoh/Phraseanet 2013-09-12 13:53:56 +02:00
Romain Neutron
a7b36af01a Fix #1457 : EntityManager:clear should not be called in a controller 2013-09-11 16:02:55 +02:00
jygaulier
f4ecfb2194 clean 2013-09-09 19:30:38 +02:00
jygaulier
dc38e7dab6 fix #1437 2013-09-09 19:30:38 +02:00
Romain Neutron
586fbb9607 Merge pull request #631 from jygaulier/3.8-fix1437 
3.8 fix1437
 2013-09-09 10:29:14 -07:00
jygaulier
467a6bc855 clean 2013-09-09 14:39:51 +02:00
jygaulier
05ce849f9b fix #1437 2013-09-09 14:32:06 +02:00
Romain Neutron
3649d89b81 Cleanup CS 2013-09-09 13:31:31 +02:00
Romain Neutron
871fa40553 Add Office Plugin client id and secret 2013-09-09 13:31:31 +02:00
Romain Neutron
a0dba36e67 Enable navigator by default 2013-09-09 13:05:55 +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
Andrey
d1d678668a Added missing line 2013-09-05 13:45:14 +02:00
Andrey
c1c8327260 Replaced SQL connection for sqlite tests 2013-09-05 13:44:15 +02:00
Andrey
6e970837a1 Added closes to patch, removed timestampable listener from 320f 2013-09-05 13:44:15 +02:00
Andrey
8f63938149 Added migration patch 2013-09-05 13:44:14 +02:00
Andrey
c0bd291f7a Add Doctrine schema pre-upgrades 2013-09-05 13:44:14 +02:00
Andrey
40b1e9e663 Restored proxies 2013-09-05 13:44:14 +02:00
Andrey
a148cef063 Added more flushes to a patch 2013-09-05 13:44:13 +02:00
Andrey
998e0c68ea Fixed errors, restored sessionrepository as it should be 2013-09-05 13:44:13 +02:00
Andrey
0fb4e8e0ee Restored usage of querybuilder in feedrepository 2013-09-05 13:44:13 +02:00
Andrey
5b0925996d Restored methods in repositories 2013-09-05 13:44:13 +02:00
Andrey
d8cac877e6 Restored repositories 2013-09-05 13:44:13 +02:00
Andrey
2773075c52 Fixed another typo in adapter 2013-09-05 13:44:12 +02:00
Andrey
58550a2410 Replaced error messages 2013-09-05 13:44:12 +02:00
Andrey
1baf81040f Fixed a typo 2013-09-05 13:44:12 +02:00
Andrey
a5cdb65ed6 Removed loadwithuser method 2013-09-05 13:44:12 +02:00
Andrey
1b8c2433b0 replaced a dql request with querybuilder one 2013-09-05 13:44:12 +02:00
Andrey
731170343b changed file path in publications 2013-09-05 13:44:11 +02:00
Andrey
887af14a82 More camelcase 2013-09-05 13:44:11 +02:00
Andrey
3cf477f5b8 Removed a few remaining underscores 2013-09-05 13:44:11 +02:00
Andrey
b555c6212e Replaced underscores in aggregate 2013-09-05 13:44:11 +02:00
Andrey
4fe6de5ffc Replaced underscores in repositories 2013-09-05 13:44:10 +02:00
Andrey
c1910a188e Replaced underscores in variable names to make them camelcase 2013-09-05 13:44:10 +02:00
Andrey
42830efef5 Removed findbyuser methods 2013-09-05 13:44:10 +02:00
Andrey
090f230dd9 replaced repository methods with query-builder ones 2013-09-05 13:44:10 +02:00
Andrey
3b3d08a9e1 removed findbyfeedanduser method 2013-09-05 13:44:09 +02:00
Andrey
3f09a919ed removed findallpublic method 2013-09-05 13:44:09 +02:00
Andrey
06bf968e39 Fixed codestyle by removing extra assignments 2013-09-05 13:44:09 +02:00
Andrey
c732d4139a Fixed exception issues 2013-09-05 13:44:09 +02:00
Andrey
444d45b25c Fixed codestyle and replaced static with self in link generator classes 2013-09-05 13:44:09 +02:00
Andrey
cedd924e31 Fixed codestyle 2013-09-05 13:44:08 +02:00
Andrey
f8c4041733 Removed yaml files 2013-09-05 13:44:08 +02:00
Andrey
7796c55ab7 Renamed and fixed entry update/delete bindings 2013-09-05 13:44:08 +02:00
Andrey
92f2ceb756 Removed extra tables from xml conf 2013-09-05 13:44:07 +02:00
Andrey
85aa5959bd Fixed minor mapping errors 
Fixed mapping error in FeedItem

Fixed merging error
 2013-09-05 13:44:07 +02:00
Andrey
4e58500fe9 Added forgotten namespace in feeditem 2013-09-05 13:44:07 +02:00
Andrey
718eb48669 Corrected incoherences in entities 2013-09-05 13:44:07 +02:00
Andrey
d788ac91f8 Added Doctrine annotations 2013-09-05 13:44:07 +02:00
Andrey
0b78191076 Add forgotten headers 2013-09-05 13:44:07 +02:00
Andrey
946240c5c5 Fixed codestyle with cs-fixer 2013-09-05 13:44:06 +02:00