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

185 Commits

Author SHA1 Message Date
Romain Neutron
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01:00
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
Nicolas Le Goff
66facbabea Add Bootstrap Carousel & Galleria as homepage presentation mode 2013-10-22 11:27:40 +02:00
Nicolas Le Goff
187aa620cf Add login template variable to get last published items 2013-10-21 16:42:36 +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
fba9da7daa Open up controller API to allow better pluginification 2013-10-02 13:59:22 +02:00
Romain Neutron
eb590780ca Fix CS 2013-09-30 18:26:32 +02:00
Romain Neutron
d00b39fec8 Merge branch '3.8' 2013-09-24 12:43:00 +02:00
Romain Neutron
b96c7e8622 Remove chrome frame toggler 2013-09-23 14:11:58 +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
6c29fc88e9 Merge branch '3.8' 
Conflicts:
	composer.lock
	templates/mobile/common/index.html.twig
 2013-09-05 13:57:42 +02:00
Andrey
c1910a188e Replaced underscores in variable names to make them camelcase 2013-09-05 13:44:10 +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
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
c1157d0613 Fixed error in RSSFeeds 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
ec5a38d5f5 Fixed 404 and 403 responses 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
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
Nicolas Le Goff
41bbd13f7d Fix #1432 User settings for notifications are not saved in 2013-09-03 18:03:43 +02:00
Romain Neutron
447cb60327 Fix CS 2013-08-30 13:48:13 +02:00
Nicolas Le Goff
ac5a929b3f Update SQLite database reference 2013-08-23 15:36:02 +02:00
Nicolas Le Goff
6a8312ca64 Add FtpCredentials entity 2013-08-23 12:09:50 +02:00
Nicolas Le Goff
307a6af069 Fix #1413 Add possibility to delete a persistent session 2013-08-08 12:26:39 +02:00
Nicolas Le Goff
6c7206cd7d Fix #1402 Issue with Secure and non secure connexion to geonames server 2013-08-06 19:12:12 +02:00
Nicolas Le Goff
139d0d96dc Fix #1386 Remove extra field from register form 2013-08-05 14:53:26 +02:00
Romain Neutron
1d1c54bf9a Merge pull request #517 from romainneutron/fix-1302 
Fix #1302 : redirect mechanism does not work as expected
 2013-07-17 08:29:26 -07:00
Romain Neutron
cdd1a21c71 Fix #1302 : redirect mechanism does not work as expected 2013-07-17 14:35:39 +02:00
Romain Neutron
8a45cac90d Fix #1348 : Call to undefined app property 2013-07-16 19:45:26 +02:00
Romain Neutron
056ac28120 Refactor command line utilities 2013-07-16 16:01:17 +02:00
Nicolas Le Goff
14a4d69ed1 Fix directory structure 
Move static declaration
 2013-07-12 20:09:51 +02:00
Nicolas Le Goff
a6a9a93b05 remove call to app in templates 2013-07-12 20:09:51 +02:00
Nicolas Le Goff
77961f5636 adressed @romainneutron's comments 2013-07-12 20:09:51 +02:00
Nicolas Le Goff
5cf51ee868 Remove unlock_usr_id variable dependency 2013-07-12 20:06:31 +02:00
Nicolas Le Goff
e94ff2c668 Remove recaptacha_display variable dependency 2013-07-12 20:06:31 +02:00
Nicolas Le Goff
0b4f8c4b07 Move static::guest_allowed method to Application 2013-07-12 20:06:31 +02:00
Romain Neutron
b90065ba24 Enhance connected users display 2013-07-12 14:50:38 +02:00
Romain Neutron
bc6a9f9f5a Use clearCookie instead of removeCookie to remove cookies 2013-07-11 18:28:20 +02:00
Romain Neutron
66b2b652d9 Merge pull request #481 from romainneutron/fix-07-10-03 
[3.8] Multiple fixes
 2013-07-10 12:17:57 -07:00
Romain Neutron
a458e0854c Revert auto select db feature 2013-07-10 19:45:19 +02:00
Romain Neutron
56ea42d2e6 Fix #1276 : persistent cookies does not authenticate 2013-07-10 19:44:22 +02:00
Romain Neutron
2427b7a6b4 Fix #1265 : Provide login in forgot password email 2013-07-10 12:39:04 +02:00