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

952 Commits

Author SHA1 Message Date
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
Nicolas Le Goff
66facbabea Add Bootstrap Carousel & Galleria as homepage presentation mode 2013-10-22 11:27:40 +02:00
Romain Neutron
f7dfe893b4 Merge branch '3.8' 
Conflicts:
	bower.json
 2013-10-15 19:11:39 +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
eb6eb689e0 Fix #1535 : API does not display search engine suggestions correctly 2013-10-10 18:00:09 +02:00
Romain Neutron
e87aa5afb3 Fix #1524 : API search query is discarded with GET method 2013-10-10 13:39:59 +02:00
Romain Neutron
b7773a44ef Drop ftp_export tables calls 2013-10-07 15:42:10 +02:00
Romain Neutron
8af5b3f610 Fix master unit tests 2013-10-04 17:13:24 +02:00
Romain Neutron
d716e91169 Merge branch '3.8' 
Conflicts:
	composer.lock
 2013-10-04 15:15:04 +02:00
Romain Neutron
3b5c9ffcb5 Fix unit tests on fresh install 2013-10-04 14:40:14 +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
f638343de1 Fix #1506 : Install data path is not saved 2013-10-02 19:30:36 +02:00
Romain Neutron
2651d16d20 Merge pull request #664 from nlegoff/fix_1343 
[3.8] Fix #1343 Display default name if label is empty
 2013-10-01 02:48:09 -07:00
Romain Neutron
eb590780ca Fix CS 2013-09-30 18:26:32 +02:00
Nicolas Le Goff
332579440a Display default name if label is empty 2013-09-30 11:43:01 +02:00
Romain Neutron
45c5276923 Merge branch '3.8' 2013-09-18 12:09:20 +02: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
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
8dfe16c2bd Fix realtime search engine indexation 2013-09-17 16:02:43 +02:00
Romain Neutron
b8ba28cd58 Merge pull request #639 from romainneutron/fix-ftpexportelement-entity 
Update unique key
 2013-09-16 00:42:55 -07: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
4db6c4e94f Update unique key 2013-09-14 01:54:31 +02:00
Romain Neutron
a7b36af01a Fix #1457 : EntityManager:clear should not be called in a controller 2013-09-11 16:02:55 +02:00
Andrey
5575a8ec73 Updated sqlite 2013-09-05 13:44:14 +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
f36173aea9 replaced missing methods in test files 2013-09-05 13:44:10 +02:00
Andrey
578eab4901 Replaced record_24 with record_1 2013-09-05 13:44:08 +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
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
082de0b7ce Reversed modifications in bridge test 2013-09-05 13:44:06 +02:00
Andrey
ff40015c97 Updated bridgetest 2013-09-05 13:44:05 +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
Andrey
289c0294b2 Rebased, fixed minor bugs 2013-09-05 13:44:04 +02:00
Andrey
84300f3c92 Replaced remaining occurrences of Feed_ classes, updated tests 2013-09-05 13:44:04 +02:00
Andrey
9a5baff4a0 Fixed iconurl integration 2013-09-05 13:44:03 +02:00
Andrey
dec41aeb4f Fixed codestyle 2013-09-05 13:44:03 +02:00
Andrey
d303a383e6 Implement feed formatters, fixed tests and prod controllers 2013-09-05 13:44:02 +02:00
Andrey
affdfe7a0a Implement RSSFeeds, fixed controllers implementation, fixed tests 2013-09-05 13:44:02 +02:00
Andrey
f117817e87 Implementation of doctrine entities 2013-09-05 13:43:04 +02:00
Romain Neutron
b6a8a90197 Fix CS 2013-09-04 12:14:52 +02:00
Romain Neutron
a81644ab08 Merge pull request #593 from romainneutron/ftp-exports 
[3.9] Add FtpExport entity
 2013-09-02 08:16:57 -07:00
Nicolas Le Goff
862053396f Adressed @romainneutron 's comments 2013-09-02 12:12:37 +02:00