Overview
SHA1:7bfce6c5904ac711d29081136bf2559ab9c24c2e
Date: 2018-12-06 15:28:03
User: bohwaz
Comment:Merge de trunk vers dev
Timelines: family | ancestors | descendants | both | dev
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2019-01-08
14:59
[ae518b948a] Merge trunk (user: bohwaz, tags: dev)
2018-12-06
15:28
[7bfce6c590] Merge de trunk vers dev (user: bohwaz, tags: dev)
2018-11-30
13:52
[ea902d98b2] Corrige mode plein écran éditeurs code / wiki (user: bohwaz, tags: trunk, stable)
2018-11-26
22:54
[6e79e54ca7] Merge avec trunk (user: bohwaz, tags: dev)
Changes

Modified src/include/lib/Garradin/Membres.php from [b2dcaceab5] to [747eeb941f].    [diff]

Modified src/include/lib/Garradin/Membres/Session.php from [76f4ec5c54] to [6e72b311e7].    [diff]

Modified src/include/lib/Garradin/Template.php from [808469b185] to [682f3b4c7a].    [diff]

Modified src/templates/admin/install.tpl from [164de6ecf1] to [2088579102].    [diff]

Modified src/templates/admin/login.tpl from [ae198371c7] to [51528da26b].    [diff]

Modified src/templates/admin/membres/ajouter.tpl from [a19929b9a3] to [e23f736695].    [diff]

Modified src/templates/admin/membres/modifier.tpl from [fad59c5b3b] to [02f4db1009].    [diff]

Modified src/templates/admin/mes_infos_securite.tpl from [811d2ba17a] to [ce884953c2].    [diff]

Modified src/templates/admin/password.tpl from [e4ce7c137d] to [d9cc01423e].    [diff]

Added src/templates/admin/password_change.tpl version [bfd4bc96b0].

Modified src/www/.htaccess from [8c789141ef] to [da372037a9].    [diff]

Modified src/www/admin/login.php from [5bb3d0cb12] to [3ef470efd1].    [diff]

Modified src/www/admin/password.php from [3ac4dae618] to [51fae7e937].    [diff]

Modified src/www/admin/static/admin.css from [2dd14f5041] to [3930ef3cf0].    [diff]

Modified src/www/admin/static/scripts/query_builder.min.js from [6daac3a8d1] to [652d101dbf].    [diff]

Modified src/www/admin/static/scripts/skel_editor.css from [9d1b561b6e] to [f204b32def].    [diff]

Modified src/www/admin/static/scripts/wiki_editor.css from [e0a0321c5b] to [d04c8ee367].    [diff]