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

245 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
097e1f21ae Remove calls to dropped orders table 2013-10-07 18:36:52 +02:00
Romain Neutron
4db6c4e94f Update unique key 2013-09-14 01:54:31 +02:00
Andrey
40b1e9e663 Restored proxies 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
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
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
3cf477f5b8 Removed a few remaining underscores 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
cedd924e31 Fixed codestyle 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
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
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
6bdfa2da29 Fixed RSSFeeds bug for php 5.3, fixed Aggregate->getEntries() called without any feed 2013-09-05 13:44:05 +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
dec41aeb4f Fixed codestyle 2013-09-05 13:44:03 +02:00
Andrey
bc5b69fae4 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
Andrey
fc9379ca63 Add more search methods to repositories 2013-09-05 13:43:04 +02:00
Andrey
c2f7a5685e Add token entities and repositories 2013-09-05 13:43:03 +02:00
Andrey
9c49589d9c Implement admin controllers 2013-09-05 13:43:03 +02:00
Andrey
b7f4f209fc Implement Doctrine feeds instead of Phrasea ones in the /list/ route 2013-09-05 13:43:03 +02:00
Romain Neutron
4c90f168a7 Remove unused use statements 2013-09-04 14:25:01 +02:00
Romain Neutron
dbd06e9091 Remove dead code 2013-09-04 12:14:50 +02:00
Romain Neutron
9804e3b4c3 Switch to FtpExport entities 2013-08-30 18:35:21 +02:00
Romain Neutron
17a4f1970a Add FtpExport repositories 2013-08-30 17:28:10 +02:00
Romain Neutron
b225f16d5f Add FtpExport entities 2013-08-30 17:28:09 +02:00
Romain Neutron
9581db19a1 Add FtpExport entities 2013-08-30 17:28:09 +02:00
Romain Neutron
58b0766e9b Merge pull request #599 from romainneutron/missing-proxies 
[3.9] Add missing proxies
 2013-08-30 08:25:49 -07:00
Romain Neutron
69374c0f26 Add missing proxies 2013-08-30 16:42:49 +02:00
Romain Neutron
f51fd3daeb Fix CS 2013-08-30 16:41:28 +02:00
Romain Neutron
817f5094a1 Merge pull request #589 from nlegoff/proxies 
[3.9] Update entity proxies
 2013-08-28 08:09:14 -07:00
Nicolas Le Goff
7b3029d931 Update entity proxies 2013-08-27 12:12:49 +02:00