hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,422 Commits 268 Branches 107 Tags
1b3fedee605b88c086cbab0066478077c55c8cc9
Commit Graph

40 Commits

Author SHA1 Message Date
aina-esokia
339de4399b port to 4.1 fix user cvs file import error on windows 2018-05-23 15:43:16 +04:00
Mike Ng
802c52d7ff refatored html code to use proper font-awesome classes 2018-01-19 13:32:20 +04:00
Florian BLOUET
0e97e4a0ae moved skins/icon to assets/common/images/icons 2015-12-02 17:35:37 +01:00
Nicolas Le Goff
2ec4ffdbcc Refactor && Typo && Use plain objects as function parameters instead of ids 2014-02-26 12:10:54 +01:00
Nicolas Le Goff
4946e35516 Fix tests, CS && typo 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
52f3baac05 Fix neutron's comment 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
75fac19e73 Migrate demand table to doctrine entity && refactor registration API 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
7c0d1e3d8d Fix user migration 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
ed4ae71819 Fix test suite 2014-02-19 17:29:25 +01:00
Nicolas Le Goff
53ae0ccc24 Remove User_Adapter Inteface References 2014-02-19 17:29:25 +01:00
Nicolas Le Goff
aa0bf78ac9 Merge branch '3.8' 
Conflicts:
	lib/classes/task/Scheduler.php
	templates/web/admin/user/demand.html.twig
 2014-02-06 17:39:41 +01:00
Nicolas Le Goff
6a71aed5f4 Fix #1688 Set submit button as absolute position 2014-02-06 15:38:00 +01:00
Nicolas Le Goff
15abccf594 Merge branch '3.8' 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php
 2014-01-20 11:08:36 +01:00
Romain Neutron
67ce16061b Fix #1658 : Registration list display is broken 2014-01-15 16:49:13 +01:00
Romain Neutron
16c1930ca0 Update templates to fit the new translator 2013-12-03 20:02:40 +01:00
Romain Neutron
e7421e1fdd Fix twig tags 2013-12-03 20:02:39 +01:00
Nicolas Le Goff
190d3839a4 Fix #1142 JS error while validating user inscriptions 2013-09-04 21:57:41 +02:00
Romain Neutron
bead1ef0b6 Merge pull request #609 from nlegoff/fix_1421 
[3.8] Fix 1421 overflow issue
 2013-09-02 08:20:54 -07:00
Nicolas Le Goff
6144f096ef Fix #1420 Fix wording 2013-09-02 17:02:30 +02:00
Nicolas Le Goff
ef81eb6edb Fix #1421 Overflow issue 2013-09-02 16:53:06 +02:00
Nicolas Le Goff
b8144fea91 adressed @romainneutron's comments 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
2f864ca2e7 Fix import CSV file skin button 2013-08-06 19:12:12 +02:00
Romain Neutron
93db8d79db Fix #1339 : Fix admin file upload callback 2013-07-17 12:18:43 +02:00
Nicolas Le Goff
b5313cc540 Use bootstrap tool 2013-06-28 15:40:58 +02:00
Romain Neutron
4fb39ff503 Update locales 2013-06-17 23:33:01 +02:00
Romain Neutron
4161ef2e31 Use url generator everywhere 2013-06-13 09:44:16 +02:00
Romain Neutron
c084f20f85 Labelize collections 2013-06-01 01:29:07 +02:00
Romain Neutron
07c9a6684e Pimp example and export downloads 2013-05-23 20:25:17 +02:00
Romain Neutron
6d1ecebf94 Fix template 2012-10-10 13:03:40 +02:00
Romain Neutron
ec11550eab Update templates 2012-10-04 15:42:53 +02:00
Ysolyne Gresille
a3ef37fc4d bugfix js admin demand 2012-09-13 19:19:02 +02:00
Ysolyne Gresille
39d1a0a5b9 Admin demande page updated 2012-09-13 18:50:09 +02:00
Ysolyne Gresille
850293ea86 template fixes for admin 2012-09-13 14:37:25 +02:00
Nicolas Le Goff
ed946cc026 cleanup & refactor 2012-09-03 18:09:01 +02:00
Nicolas Le Goff
db40a0bf7c fix some bugs 2012-09-03 18:09:01 +02:00
Nicolas Le Goff
c0dacd84b4 replace delete controllers by post controllers 
fix tests

fix typo

fix tests
 2012-09-03 18:08:59 +02:00
Nicolas Le Goff
e62d1e924c add details view for collection & databox; add sphinxconf; add users import & export; 
add tests
 2012-09-03 18:08:56 +02:00
Nicolas Le Goff
1cf1a5cef9 add demand.php 2012-09-03 18:08:55 +02:00
Nicolas Le Goff
5d07b96704 add collorder & add new coll & add suggested value 2012-09-03 18:08:55 +02:00