hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 22:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,889 Commits 268 Branches 107 Tags
01468e284ea4ac65f13da29ef13d26ba5aa47d9c
Commit Graph

5889 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
516f46c3d3 Merge pull request #408 from nlegoff/fix_1207 
[3.8] Fix #1207 Fix export button
 2013-06-17 10:36:02 -07: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
08c6ca4d26 Merge pull request #401 from nlegoff/fix_1131 
[3.8] Fix #1131 & remove jquery.validate* dependencies
 2013-06-17 10:06:29 -07:00
Romain Neutron
5b06914bca Add localized labels in subdef editing 2013-06-17 18:54:10 +02:00
Nicolas Le Goff
93ec7e702c Fix #1207 Fix export button 2013-06-17 18:48:26 +02:00
Romain Neutron
bc6ab201d5 Update changelog 2013-06-17 18:25:10 +02:00
Romain Neutron
5bacbaf694 Add bin/console check:config command 2013-06-17 18:24:58 +02:00
Romain Neutron
6e775a6fa5 Merge pull request #406 from nlegoff/fix_typo 
[3.8] Fix vocabulary error
 2013-06-17 09:09:59 -07:00
Nicolas Le Goff
7c226e3349 Fix typo 2013-06-17 17:25:42 +02:00
Nicolas Le Goff
a4fb3d958b Fix #788 Add a default basket 2013-06-17 17:20:14 +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
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
Nicolas Le Goff
0caa8754b6 Concatenate JS files 2013-06-17 15:39:46 +02:00
Romain Neutron
4e3496447a Merge branch 'nlegoff-fix_878' 2013-06-17 15:09:42 +02: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
90e2030b6a Update changelog 2013-06-17 12:32:02 +02:00
Romain Neutron
247b49668e Add bzip2/gzip option for DBs backup 2013-06-17 12:31:27 +02:00
Nicolas Le Goff
e9569b2066 Remove old validation system 2013-06-17 12:23:26 +02:00
Nicolas Le Goff
c509a1bf47 Fix tests 2013-06-17 12:17:44 +02:00
Nicolas Le Goff
164d012437 Reorder forms organisation add a way to custom view & add callback once error is rendered 2013-06-17 12:09:51 +02:00
Nicolas Le Goff
26a06f0178 Add renew email form validation 2013-06-17 12:09:01 +02:00
Romain Neutron
09c6361475 Add trusted proxies configuration 2013-06-14 20:36:06 +02:00
Nicolas Le Goff
4ed16a8f75 Use html5 to validate setup form, use html5 fallback if client does not support this feature 
Add modernizr to admin group
 2013-06-14 20:13:16 +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
Nicolas Le Goff
fc5fea2c2f Fix #1131 Add password strength validation 2013-06-14 16:55:29 +02:00
Nicolas Le Goff
9be2194485 Fix #878 Add delete from basket button in detailled view 2013-06-14 11:53:43 +02:00
Nicolas Le Goff
8a8868798b Set humanejs info & error function 2013-06-14 11:45:01 +02:00
Nicolas Le Goff
a846a81ec2 Remove unecessary slash 2013-06-14 11:44:30 +02: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
d96f8d3016 Update Changelog 2013-06-14 09:48:31 +02: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
41217b8f37 Update changelog 2013-06-14 09:47:31 +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
f642a96809 Merge pull request #396 from romainneutron/time-limit-sbas 
[3.8] Time limit sbas
 2013-06-14 00:44:24 -07:00
Romain Neutron
798adebcb0 Merge pull request #397 from romainneutron/symfony-2.3 
[3.8] Bump to symfony 2.3
 2013-06-14 00:44:13 -07:00
Romain Neutron
aa64d38c3b Enable cache extension in travis build 2013-06-14 09:43:28 +02:00
Romain Neutron
59162e73fb Use composer phpunit in travis build 2013-06-13 21:52:36 +02:00
Romain Neutron
b56cebad2b Bump to symfony 2.3 2013-06-13 20:59:00 +02:00
Romain Neutron
347cc6434c Update changelog 2013-06-13 19:45:20 +02:00