hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,767 Commits 268 Branches 107 Tags
72f20a01e5225067e734a7a94b718b9ee00dbfb7
Commit Graph

939 Commits

Author SHA1 Message Date
Romain Neutron
fac302dcbd Fix #1479 : Add validation duration in mail body 2013-09-19 14:39:16 +02:00
Romain Neutron
a013b8d9e1 Merge pull request #641 from romainneutron/upgrade-instructions 
[3.8] Remove infinite redirection, add upgrade instructions
 2013-09-17 08:06:48 -07:00
Romain Neutron
4ce8bdeaf8 Fix suggested values editing 2013-09-17 16:36:22 +02:00
Romain Neutron
b81f894d22 Remove infinite redirection, add upgrade instructions 2013-09-17 16:28:23 +02:00
Romain Neutron
f955163edb Merge branch '3.7' into 3.8 
Conflicts:
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/conf.d/_GV_template.inc
 2013-09-14 02:02:56 +02:00
jygaulier
f4ecfb2194 clean 2013-09-09 19:30:38 +02:00
jygaulier
dc38e7dab6 fix #1437 2013-09-09 19:30:38 +02:00
Romain Neutron
6974ca5fb9 Merge pull request #625 from nlegoff/fix_1445 
[3.8] Fix #1445 Move record dialog improvement
 2013-09-05 04:04:43 -07:00
Nicolas Le Goff
ce55141917 Fix #1445 Wording & issue while moving record from collections 2013-09-05 12:04:18 +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
3736510c72 Fix #1424 : Editing a story don't work 2013-09-02 13:57:22 +02:00
Nicolas Le Goff
f20b916004 Adressed @romainneutron 's comments 2013-08-09 18:03:17 +02:00
Nicolas Le Goff
416113574d Use temporary file system 2013-08-08 16:25:16 +02:00
Nicolas Le Goff
74f8bc3c3c Fix CS 2013-08-08 16:25:16 +02:00
Nicolas Le Goff
db359920c8 Fix #1414 Add immediate thumbnail substitution after success download 2013-08-08 16:25:16 +02:00
Nicolas Le Goff
47bb3331dd Move substituion logger from class method to controllers 2013-08-08 16:25:15 +02:00
Romain Neutron
acd7e18646 Merge pull request #557 from nlegoff/fix_1413 
[3.8] Fix #1413 Add possibility to delete a persistent session
 2013-08-08 03:27:35 -07:00
Nicolas Le Goff
307a6af069 Fix #1413 Add possibility to delete a persistent session 2013-08-08 12:26:39 +02:00
Romain Neutron
0ee6e87c2a Fix search engine suggestions usage 2013-08-08 11:05:47 +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
6c7206cd7d Fix #1402 Issue with Secure and non secure connexion to geonames server 2013-08-06 19:12:12 +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
139d0d96dc Fix #1386 Remove extra field from register form 2013-08-05 14:53:26 +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
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
a6e7d3e762 Fix #1338 : Fix collection order setting 2013-07-17 13:38:48 +02:00
Romain Neutron
202b4f016d Merge pull request #514 from romainneutron/fix-1339 
Fix #1339 : Fix admin file upload callback
 2013-07-17 04:08:47 -07:00
Romain Neutron
93db8d79db Fix #1339 : Fix admin file upload callback 2013-07-17 12:18:43 +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
5b0bc8b284 Add recess binary 
Set recess binary to config
 2013-07-12 20:06:32 +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
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
7416a004ba Merge pull request #500 from romainneutron/fix-1313 
[3.8] Fix #1313 : edit multiple records does not work
 2013-07-11 15:28:51 -07:00