hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 05:53:13 +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
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
2ece9a7cdc Merge pull request #640 from romainneutron/composer-options 
[3.8] Disable composer interactivity
 2013-09-17 08:06:24 -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
0047d0fc36 Never reset date sort settings, remove date field choser 2013-09-17 16:33:48 +02:00
Romain Neutron
b81f894d22 Remove infinite redirection, add upgrade instructions 2013-09-17 16:28:23 +02:00
Romain Neutron
91dd9ce321 Disable composer interactivity 2013-09-17 16:22:01 +02:00
Romain Neutron
2baa5a6484 Fix merge 2013-09-14 02:12:20 +02:00
Romain Neutron
017000f1c8 Update version name 2013-09-14 02:10:59 +02:00
Romain Neutron
2727f939ee Fix #1457 : EntityManager:clear should not be called in a controller 2013-09-14 02:10:12 +02:00
Romain Neutron
00d4c595ee Update version name 2013-09-14 02:04:04 +02:00
Romain Neutron
f955163edb Merge branch '3.7' into 3.8 
Conflicts:
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/conf.d/_GV_template.inc
 2013-09-14 02:02:56 +02:00
Romain Neutron
2c7073182a Fix CS 2013-09-12 13:55:31 +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
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
871fa40553 Add Office Plugin client id and secret 2013-09-09 13:31:31 +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
c1c8327260 Replaced SQL connection for sqlite tests 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
998e0c68ea Fixed errors, restored sessionrepository as it should be 2013-09-05 13:44:13 +02:00
Andrey
58550a2410 Replaced error messages 2013-09-05 13:44:12 +02:00
Andrey
a5cdb65ed6 Removed loadwithuser method 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
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
7796c55ab7 Renamed and fixed entry update/delete bindings 2013-09-05 13:44:08 +02:00
Andrey
946240c5c5 Fixed codestyle with cs-fixer 2013-09-05 13:44:06 +02:00
Andrey
1764d5f5c4 Fixed order in entry/update, fixed a lot of codestyle 2013-09-05 13:44:06 +02:00
Andrey
c8b62c02db Rebased, fixed codestyle 2013-09-05 13:44:06 +02:00
Andrey
d8d9ab7607 Removed remaining occurrences to Feed_, adapted patch_320f 2013-09-05 13:44:05 +02:00
Andrey
6bdfa2da29 Fixed RSSFeeds bug for php 5.3, fixed Aggregate->getEntries() called without any feed 2013-09-05 13:44:05 +02:00
Andrey
3f8855f5cb Fixed zero and null confusion in RSSFeeds 2013-09-05 13:44:04 +02:00