Commit Graph

233 Commits

Author SHA1 Message Date
Romain Neutron
f7dfe893b4 Merge branch '3.8'
Conflicts:
	bower.json
2013-10-15 19:11:39 +02:00
Romain Neutron
92fe657e80 Fix #1528 : Restrict collection ordering on available collections 2013-10-15 14:14:44 +02:00
Romain Neutron
eb590780ca Fix CS 2013-09-30 18:26:32 +02:00
Romain Neutron
45c5276923 Merge branch '3.8' 2013-09-18 12:09:20 +02:00
Romain Neutron
4ce8bdeaf8 Fix suggested values editing 2013-09-17 16:36:22 +02:00
Andrey
998e0c68ea Fixed errors, restored sessionrepository as it should be 2013-09-05 13:44:13 +02:00
Andrey
58550a2410 Replaced error messages 2013-09-05 13:44:12 +02:00
Andrey
731170343b changed file path in publications 2013-09-05 13:44:11 +02:00
Andrey
c732d4139a Fixed exception issues 2013-09-05 13:44:09 +02:00
Andrey
cedd924e31 Fixed codestyle 2013-09-05 13:44:08 +02:00
Andrey
1764d5f5c4 Fixed order in entry/update, fixed a lot of codestyle 2013-09-05 13:44:06 +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
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
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
dbd06e9091 Remove dead code 2013-09-04 12:14:50 +02:00
Romain Neutron
447cb60327 Fix CS 2013-08-30 13:48:13 +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
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
Romain Neutron
f19c326e95 Tweak code 2013-08-07 14:23:32 +02:00
Nicolas Le Goff
93b48fdcea adressed @romainneutron's comments 2013-08-07 14:23:32 +02:00
Nicolas Le Goff
aa92dbe124 Fix unit tests 2013-08-07 14:23:32 +02:00
Nicolas Le Goff
10900faabd Fix #1403 Wron g calculation for detailled view 2013-08-07 14:23:31 +02:00
Nicolas Le Goff
f47bbcd73e Fix #1394 & Fix #1393 & Fix #1392 Import users trough CSV is broken 2013-08-07 14:23:31 +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
75b99424e9 Fix #1327 & #1326 Can not delete or empty collection 2013-08-07 14:23:29 +02:00
Romain Neutron
7cca109633 Tweak code 2013-08-07 14:22:54 +02:00
Nicolas Le Goff
61581c5c99 adressed @romainneutron's comments 2013-08-07 12:01:58 +02:00
Nicolas Le Goff
5aeeaa813f Fix unit tests 2013-08-07 12:01:57 +02:00
Nicolas Le Goff
d4bc24c055 Fix #1403 Wron g calculation for detailled view 2013-08-06 19:12:12 +02:00
Nicolas Le Goff
4c59c755ff Fix #1394 & Fix #1393 & Fix #1392 Import users trough CSV is broken 2013-08-06 19:12:12 +02:00
Nicolas Le Goff
d413394027 Fix #1380 Add default settings for periodic tasks 2013-08-06 19:12:10 +02:00
Nicolas Le Goff
bfffa8de60 Fix #1327 & #1326 Can not delete or empty collection 2013-08-05 14:53:25 +02:00
Romain Neutron
50d2d94736 Fix #1365 : Collection rename redirect to a wrong URL 2013-07-23 17:18:13 +02:00
Romain Neutron
cfe3d0848b Fix task controller 2013-07-18 19:32:29 +02:00
Romain Neutron
0ab927ec97 Fix #1243 Phraseanet enabled languages is now configurable 2013-07-17 21:22:01 +02:00
Romain Neutron
bb45954bd1 Merge pull request #515 from romainneutron/fix-1338
Fix 1338
2013-07-17 08:30:11 -07:00
Romain Neutron
a6e7d3e762 Fix #1338 : Fix collection order setting 2013-07-17 13:38:48 +02:00
Romain Neutron
93db8d79db Fix #1339 : Fix admin file upload callback 2013-07-17 12:18:43 +02:00
Romain Neutron
668b931b96 Merge pull request #507 from romainneutron/fix-1325
[3.8]  Fix #1325 : Fix collection redirection after label settings
2013-07-12 09:41:18 -07:00
Romain Neutron
9a154ad0d7 Fix #1325 : Fix collection redirection after label settings 2013-07-12 14:56:53 +02:00
Romain Neutron
b90065ba24 Enhance connected users display 2013-07-12 14:50:38 +02:00
Romain Neutron
5dd11c4076 Fix #1285 : Duplicate rights on create collection does not work 2013-07-11 15:16:07 +02:00
Romain Neutron
9c531b9466 Merge pull request #476 from romainneutron/fix_07-10
[3.8] Multiple fixes
2013-07-10 09:19:48 -07:00
Romain Neutron
2d8e53bef2 Reload tree after databox unmount 2013-07-10 14:36:48 +02:00