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

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/classes/task/Scheduler.php
	templates/web/admin/user/demand.html.twig
This commit is contained in:
Nicolas Le Goff
2014-02-06 17:39:41 +01:00
parent efc4b61e59 5bbea2f6ce
commit aa0bf78ac9
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/web/admin/user/demand.html.twig
View File

@@ -199,6 +199,7 @@
</thead>
</table>
<div class="registration-wrapper PNB" style="top:160px;bottom: 50px;overflow: auto">
<div id="tab_demandes">
{% set tableColls = table['coll'] %}
{% for row in table['user'] %}
@@ -270,8 +271,9 @@
</div>
{% endfor %}
</div>
</div>
<div class="form-actions">
<div class="PNB" style="top:auto;height: 30px;">
<button type="button" class="btn btn-primary submit">{{ 'boutton::valider' | trans }}</button>
</div>
</form>