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

1762 Commits

Author SHA1 Message Date
Romain Neutron
337bcc98b7 Merge pull request #432 from romainneutron/media-alchemyst 
[3.8] Bump to Media alchemyst 0.3
 2013-06-27 04:49:49 -07:00
Romain Neutron
76b76ce16f Merge pull request #436 from jygaulier/master-fix1150 
[3.8] fix #1150
 2013-06-27 04:48:18 -07:00
Romain Neutron
7089cfa5e0 Add audio bitrate selection 2013-06-27 12:43:24 +02:00
Romain Neutron
f95bd97fc3 Update to latest media alchemyst api 2013-06-27 12:43:24 +02:00
Romain Neutron
4b06608caa Update to media-alchemyst 0.3 2013-06-27 12:43:24 +02:00
Romain Neutron
32875e6698 Remove support of binary paths by registry 2013-06-27 12:43:24 +02:00
Romain Neutron
64e2128cbf Fix patch version numbers 2013-06-27 12:43:23 +02:00
jygaulier
4138c50b22 fix #1150 2013-06-27 10:36:12 +02:00
Romain Neutron
94ed0a90e4 Merge pull request #423 from nlegoff/jquery_ui_1.10.3 
[3.8] Update jquery-ui 1.8 to 1.10.*
 2013-06-24 10:49:48 -07:00
Romain Neutron
6a1e63e317 Merge pull request #421 from romainneutron/rootpath 
[3.8] Remove registry's GV_RootPath calls
 2013-06-24 08:39:50 -07:00
Romain Neutron
22da3229e9 Merge pull request #420 from romainneutron/503 
[3.8] Add better HTTP 503 support
 2013-06-24 03:03:46 -07:00
Nicolas Le Goff
764fa42f14 Update to jquery ui 1.10.3 
Fix conflict & ui bugs

Remove debug
 2013-06-21 13:46:16 +02:00
Nicolas Le Goff
484cdb5f23 Fix variable name collision 2013-06-20 17:38:36 +02:00
Romain Neutron
10ea4c26c8 Merge pull request #419 from romainneutron/mails-fix 
[3.8] Fix notification use
 2013-06-20 05:04:12 -07:00
Romain Neutron
3f47cc248d Remove registry's GV_RootPath calls 2013-06-19 19:25:16 +02:00
Romain Neutron
ae89305575 Add better maintenance handling 2013-06-19 19:22:44 +02:00
Romain Neutron
98bb412575 Merge pull request #417 from nlegoff/fix_993 
[3.8] Fix #993 Add send report button for basket validation in lightbox in mobile view
 2013-06-19 08:50:46 -07:00
Romain Neutron
a97e4a4df4 Fix notification use 2013-06-19 16:47:23 +02:00
Romain Neutron
592ba01950 Merge pull request #411 from romainneutron/cache-patch 
[3.8] Cache patch
 2013-06-19 07:12:42 -07:00
Nicolas Le Goff
445444b7da Set missing user 2013-06-18 17:49:59 +02:00
Nicolas Le Goff
b237705bcd Set missing user 2013-06-18 17:49:59 +02:00
Romain Neutron
af9307b148 Add sessions patch 2013-06-18 15:37:19 +02:00
Romain Neutron
117bf1fc68 Fix patch : escape reserved SQL words 2013-06-18 09:38:07 +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
eadfc69e94 Merge pull request #407 from romainneutron/check-config 
[3.8] Add check config command
 2013-06-17 11:26:27 -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
c8b61b3748 Merge pull request #409 from romainneutron/subdef-labels 
[3.8] Add localized labels in subdef editing
 2013-06-17 10:34:40 -07:00
Romain Neutron
241705a568 Merge pull request #399 from romainneutron/ip-proxies 
[3.8] Add trusted proxies configuration
 2013-06-17 10:28:49 -07:00
Romain Neutron
5b06914bca Add localized labels in subdef editing 2013-06-17 18:54:10 +02:00
Romain Neutron
5bacbaf694 Add bin/console check:config command 2013-06-17 18:24:58 +02:00
Romain Neutron
42db38d055 Add error pages, fix error handling and PHP conf 2013-06-17 17:01:35 +02:00
Romain Neutron
9f29b403f7 Merge pull request #402 from romainneutron/gz-dumps 
[3.8] Add gzip/bzip2 options for DBs backup commandline tool.
 2013-06-17 07:43:05 -07:00
Romain Neutron
c061191334 Fix CS 2013-06-17 15:09:23 +02:00
Romain Neutron
f6d975764e Merge branch 'fix_878' of https://github.com/nlegoff/Phraseanet into nlegoff-fix_878 2013-06-17 15:08:25 +02:00
Nicolas Le Goff
28658aaf98 Adress PR's comments 2013-06-17 12:35:21 +02:00
Romain Neutron
247b49668e Add bzip2/gzip option for DBs backup 2013-06-17 12:31:27 +02:00
Romain Neutron
2d9408c93f Merge pull request #394 from romainneutron/template-time-limits 
[3.8] Template time limits
 2013-06-14 08:24:18 -07:00
Romain Neutron
6dafcaf775 Merge pull request #392 from romainneutron/status-labels 
[3.8] Add status-bits labels
 2013-06-14 02:27:10 -07:00
Romain Neutron
7c88990bf2 Merge pull request #398 from romainneutron/cache-extension 
[3.8] Enable cache extension in travis build
 2013-06-14 02:26:42 -07:00
Romain Neutron
906d4ba9c5 Localize status bits 2013-06-14 09:47:54 +02:00
Romain Neutron
1a13d02c2a Remove status bit name, use only labels 2013-06-14 09:47:53 +02:00
Romain Neutron
4b5d10151d Apply time limits on template application 2013-06-14 09:47:30 +02:00
Romain Neutron
a7c4739797 Merge pull request #393 from romainneutron/collection-labels-api 
[3.8] Add collection labels to api
 2013-06-14 00:44:51 -07:00
Romain Neutron
07d4ff7d45 Merge pull request #395 from romainneutron/template-sorting 
[3.8] Add sort on last applied template
 2013-06-14 00:44:34 -07:00
Romain Neutron
aa64d38c3b Enable cache extension in travis build 2013-06-14 09:43:28 +02:00
Romain Neutron
6584d3583a Add sort on last applied template 2013-06-13 17:21:15 +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
Romain Neutron
d2a50f31b0 Add collection labels to api 2013-06-13 16:15:38 +02:00