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

99 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
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
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
8dfe16c2bd Fix realtime search engine indexation 2013-09-17 16:02:43 +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
84300f3c92 Replaced remaining occurrences of Feed_ classes, updated tests 2013-09-05 13:44:04 +02:00
Andrey
d303a383e6 Implement feed formatters, fixed tests and prod controllers 2013-09-05 13:44:02 +02:00
Andrey
f117817e87 Implementation of doctrine entities 2013-09-05 13:43:04 +02:00
Romain Neutron
447cb60327 Fix CS 2013-08-30 13:48:13 +02:00
Andrey
3828b82399 fixed record adapter test 2013-08-27 11:58:49 +02:00
Andrey
9b85b105d8 Fixed PR comments 2013-08-27 11:58:48 +02:00
Andrey
666adad2f0 Fixed record adapter test 2013-08-27 11:58:46 +02:00
Andrey
149fa62d62 Updated test database, fixed a record test 2013-08-27 11:58:46 +02:00
Andrey
07ff0c4d7a First implementation of orders using Doctrine 2013-08-27 11:58:44 +02:00
Nicolas Le Goff
33b0648ce5 Update SQLite database reference 2013-08-27 00:30:03 +02:00
Nicolas Le Goff
6969fb6a7c Add user repositories functions 2013-08-27 00:18:41 +02:00
Romain Neutron
233d7bcd62 Merge pull request #569 from nlegoff/ftp 
[3.9] Remove ftp credentials from 'usr' table
 2013-08-23 08:07:01 -07:00
Nicolas Le Goff
6a8312ca64 Add FtpCredentials entity 2013-08-23 12:09:50 +02:00
Nicolas Le Goff
cfd49dd06e Fix database update 2013-08-20 16:53:01 +02:00
Nicolas Le Goff
628938fdbf Fix #1380 Add default settings for periodic tasks 2013-08-07 14:23:31 +02:00
Nicolas Le Goff
d413394027 Fix #1380 Add default settings for periodic tasks 2013-08-06 19:12:10 +02:00
Romain Neutron
aba9d3b603 Fix #1360 : Registered providers are not removed on user delete 2013-07-22 14:16:15 +02:00
Romain Neutron
056ac28120 Refactor command line utilities 2013-07-16 16:01:17 +02:00
Romain Neutron
14da7484b0 Remove deprecated patch 2013-07-10 15:56:21 +02:00
Romain Neutron
435b4b1644 Link header should provide fully qualified URIs 2013-07-10 15:56:20 +02:00
Romain Neutron
ae1ff34db4 Add unit tests 2013-07-04 14:28:13 +02:00
Romain Neutron
4720a46b66 Update geoname server service provider 2013-07-02 15:04:33 +02:00
Romain Neutron
2307a0b038 Replace old files with new ones 2013-06-28 18:49:47 +02:00
Nicolas Le Goff
6cf34c53c3 PR's comments adressed 
Remove pragma header

Remove extra line

PR'S comments adressed

Fix CS

PR's comments adressed

Remove seless tests
 2013-06-28 00:16:33 +02:00
Romain Neutron
3f47cc248d Remove registry's GV_RootPath calls 2013-06-19 19:25:16 +02:00
Romain Neutron
92415b96e8 Merge pull request #404 from romainneutron/doctrine-entities 
[3.8] Regenerate doctrine entities and proxies
 2013-06-17 12:22:35 -07:00
Romain Neutron
88c3df2ef7 Regenerate doctrine entities and proxies 2013-06-17 20:11:44 +02:00
Romain Neutron
d8427e0c2c Merge pull request #403 from romainneutron/orders 
[3.8] Update emails notifications
 2013-06-17 10:38:22 -07:00
Romain Neutron
784e454311 Update emails notifications 2013-06-17 19:37:52 +02:00
Romain Neutron
6e3950f799 Add memory limit setting in unit tests 2013-06-17 17:01:35 +02:00
Romain Neutron
42db38d055 Add error pages, fix error handling and PHP conf 2013-06-17 17:01:35 +02:00
Romain Neutron
4b5d10151d Apply time limits on template application 2013-06-14 09:47:30 +02:00
Romain Neutron
f9b4978569 Merge pull request #390 from romainneutron/databox-labels 
[3.8] Add labels to databoxes
 2013-06-13 07:41:05 -07:00
Nicolas Le Goff
5fe2f4d554 Fix phpunit tests 2013-06-13 14:03:57 +02:00
Romain Neutron
25a00d3c6e Merge pull request #387 from romainneutron/url-generator 
[3.8] Use url generator
 2013-06-13 01:21:02 -07:00
Romain Neutron
11a55bbd43 Add labels to databoxes 2013-06-13 09:45:43 +02:00
Romain Neutron
4161ef2e31 Use url generator everywhere 2013-06-13 09:44:16 +02:00
Nicolas Le Goff
c663d9d82d Fix #1101 Add sended record throught mail in report 
Fix typo
 2013-06-12 16:57:11 +02:00
Romain Neutron
3077ce08ec Move patch to migration 2013-06-11 16:27:22 +02:00
Romain Neutron
32c2d6154a Remove phraseanet services, update configuration 2013-06-11 14:05:44 +02:00