hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-09 19:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,854 Commits 268 Branches 107 Tags
051d9f4035ddd03da583f6a4d0747da2bc11da50
Commit Graph

50 Commits

Author SHA1 Message Date
Romain Neutron
051d9f4035 Remove license comments 2013-11-20 16:49:29 +01:00
Romain Neutron
7e0a3c7338 Use configuration property accessor 2013-11-18 18:48:27 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
13915dc1a8 Rename "phraseanet.configuration" service to "configuration" 2013-11-15 22:08:07 +01:00
Romain Neutron
3451895515 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Core/Version.php
 2013-11-14 17:52:52 +01:00
Romain Neutron
e2602da9b6 Merge pull request #786 from romainneutron/fix-1572 
[3.8] Fix #1572 : Add configuration customization
 2013-11-14 08:51:19 -08:00
Romain Neutron
22168ba3bf Fix #1572 : Add configuration customization 2013-11-14 17:10:53 +01:00
Romain Neutron
84c444c186 Fix editing default user settings 2013-11-14 13:29:49 +01:00
Romain Neutron
a5c7695ace Fix some sql compositions 2013-11-13 17:54:17 +01:00
Romain Neutron
432252f5f8 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Root/Account.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/User/Adapter.php
	lib/classes/eventsmanager/broker.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/uploadquarantine.php
	lib/classes/eventsmanager/notify/validationdone.php
	templates/web/admin/index.html.twig
 2013-11-12 19:19:13 +01:00
Romain Neutron
bea211074b Fix #1571 : Cleanup user settings, fix user settings calls 2013-11-12 15:16:54 +01:00
Nicolas Le Goff
4cef82083c Add ACL Manipulator 2013-11-08 17:51:14 +01:00
Nicolas Le Goff
1fdf30c6af Use ACL service provider to get user's ACL 2013-11-05 12:21:42 +01:00
Romain Neutron
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01:00
Romain Neutron
35e9e692d2 Fix ACL cache issue 2013-10-25 18:47:26 +02: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
Romain Neutron
097e1f21ae Remove calls to dropped orders table 2013-10-07 18:36:52 +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
d7c720ed7d Fix #1501 increase usr_login column size 2013-10-02 17:33:26 +02:00
Romain Neutron
b6a8a90197 Fix CS 2013-09-04 12:14:52 +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
447cb60327 Fix CS 2013-08-30 13:48:13 +02:00
Nicolas Le Goff
34b4fdde74 Remove get_wrong_email_users() from User_Adapter 2013-08-26 17:48:51 +02:00
Nicolas Le Goff
cc631a1e7f Add UserQuery entity 2013-08-25 13:55:04 +02:00
Romain Neutron
7909bc5688 Merge pull request #578 from nlegoff/clientinfo 
[3.9] Move updateClientInfos function to Session_Logger
 2013-08-24 05:44:22 -07:00
Romain Neutron
a7ec620d92 Merge pull request #577 from nlegoff/protected_rss_url 
[3.9] Delete unusued get_protected_rss_url function
 2013-08-24 05:43:49 -07: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
e07c57d409 Move updateClientInfos functioon to Session_Logger 2013-08-22 10:57:24 +02:00
Nicolas Le Goff
978fe42eb6 Delete unusued get_protected_rss_url function 2013-08-21 19:59:28 +02:00
Romain Neutron
1edc1a4a6a Remove deprecated code 2013-07-23 17:20:23 +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
0ab927ec97 Fix #1243 Phraseanet enabled languages is now configurable 2013-07-17 21:22:01 +02:00
Romain Neutron
4720a46b66 Update geoname server service provider 2013-07-02 15:04:33 +02:00
Romain Neutron
88c3df2ef7 Regenerate doctrine entities and proxies 2013-06-17 20:11:44 +02:00
Romain Neutron
f6e1f95669 Fix account tests 2013-05-29 14:23:18 +02:00
Romain Neutron
76e45f5401 Fix set_locale method 2013-05-29 14:23:04 +02:00
Romain Neutron
76413165ff Update authentication to service provider 2013-05-29 14:22:51 +02:00
Romain Neutron
6537b96f4c Add AuthenticationServiceProvider 2013-05-29 14:22:50 +02:00
Romain Neutron
5a80e9dc22 Introduce configuration-tester 2013-05-13 15:07:47 +02:00
Romain Neutron
cf0f13d9c9 Add TokensServiceProvider 2013-04-30 18:44:35 +02:00
Romain Neutron
00ea1c4c25 Merge pull request #292 from romainneutron/session-not-found 
[3.8] Logout in case the session is not found
 2013-01-29 09:41:43 -08:00
Romain Neutron
c184278b40 Fix doc blocks 2013-01-29 18:34:50 +01:00
Romain Neutron
4414892b91 Fix CS lib/classes 2013-01-29 16:39:02 +01:00
Romain Neutron
774f6d541b Logout in case the session is not found 2013-01-29 16:26:21 +01:00
Romain Neutron
aa18c48306 Fix unit tests 2013-01-29 09:34:20 +01:00
Romain Neutron
842ad40985 Bump copyright year 2013-01-21 23:28:58 +01:00
Romain Neutron
2069d40544 Use composer as application autoloader 2013-01-18 17:47:25 +01:00