Branch: refs/heads/develop
Home: https://github.com/glFusion/glfusion
Commit: 0e253a3d2a3f00d8ec5f6c1901cfc5e4c8a67ef2
https://github.com/glFusion/glfusion/commit/0e253a3d2a3f00d8ec5f6c1901cfc5e4c8a67ef2
Author: matrox66 <matrox66@xxxxxxx>
Date: 2017-01-21 (Sat, 21 Jan 2017)
Changed paths:
M CHANGELOG.md
M private/plugins/mediagallery/include/albumedit.php
M private/plugins/mediagallery/include/global.php
M private/plugins/mediagallery/templates/admin/editdefaults.thtml
M private/plugins/mediagallery/templates/editalbum.thtml
M private/plugins/mediagallery/templates/global_album_attr.thtml
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/glFusion/develop' into develop
Commit: 735f01f1b1d32149ed00a32eeb6a73359510f4bc
https://github.com/glFusion/glfusion/commit/735f01f1b1d32149ed00a32eeb6a73359510f4bc
Author: matrox66 <matrox66@xxxxxxx>
Date: 2017-01-22 (Sun, 22 Jan 2017)
Changed paths:
M CHANGELOG.md
M public_html/forum/createtopic.php
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/glFusion/develop' into develop
Commit: 5e074bb176ed780fb0e68132f28b2ff0b83a4905
https://github.com/glFusion/glfusion/commit/5e074bb176ed780fb0e68132f28b2ff0b83a4905
Author: matrox66 <matrox66@xxxxxxx>
Date: 2017-01-22 (Sun, 22 Jan 2017)
Changed paths:
M CHANGELOG.md
M private/plugins/forum/templates/admin/boards_edtcategory.thtml
M private/plugins/forum/templates/admin/boards_edtforum.thtml
M public_html/layout/cms/profiles/contactauthorform.thtml
M public_html/layout/cms/profiles/contactuserform.thtml
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/glFusion/develop' into develop
Commit: 5675e361d4407e133d9165eb35a665d4d5fc2e64
https://github.com/glFusion/glfusion/commit/5675e361d4407e133d9165eb35a665d4d5fc2e64
Author: matrox66 <matrox66@xxxxxxx>
Date: 2017-01-22 (Sun, 22 Jan 2017)
Changed paths:
M private/plugins/filemgmt/templates/upload.thtml
M private/plugins/forum/templates/mod_confirm.thtml
M private/plugins/mediagallery/templates/editalbum.thtml
M private/plugins/mediagallery/templates/gl_story_import.thtml
M private/plugins/mediagallery/templates/remoteupload.thtml
M public_html/admin/install/fusionrescue.php
M public_html/layout/cms/admin/autotag/autotag_namespace_perm.thtml
M public_html/layout/cms/profiles/contactauthorform.thtml
M public_html/layout/cms/profiles/contactuserform.thtml
Log Message:
-----------
Wrong button-type
Changed button type="cancel" to button type="submit"
Commit: 6c22b8262cf73deab4c2541455b8903d78a2ed45
https://github.com/glFusion/glfusion/commit/6c22b8262cf73deab4c2541455b8903d78a2ed45
Author: matrox66 <matrox66@xxxxxxx>
Date: 2017-01-22 (Sun, 22 Jan 2017)
Changed paths:
M private/plugins/mediagallery/language/german.php
M private/plugins/mediagallery/language/german_formal.php
M private/plugins/mediagallery/language/german_formal_utf-8.php
M private/plugins/mediagallery/language/german_utf-8.php
Log Message:
-----------
MediaGallery German Update
MediaGallery German Update
Commit: 88bcf7ceadc6c94a2cbaeb82947be9b5c0e78bfa
https://github.com/glFusion/glfusion/commit/88bcf7ceadc6c94a2cbaeb82947be9b5c0e78bfa
Author: Mark R. Evans <mark@xxxxxxxxxx>
Date: 2017-01-22 (Sun, 22 Jan 2017)
Changed paths:
M private/plugins/filemgmt/templates/upload.thtml
M private/plugins/forum/templates/mod_confirm.thtml
M private/plugins/mediagallery/language/german.php
M private/plugins/mediagallery/language/german_formal.php
M private/plugins/mediagallery/language/german_formal_utf-8.php
M private/plugins/mediagallery/language/german_utf-8.php
M private/plugins/mediagallery/templates/editalbum.thtml
M private/plugins/mediagallery/templates/gl_story_import.thtml
M private/plugins/mediagallery/templates/remoteupload.thtml
M public_html/admin/install/fusionrescue.php
M public_html/layout/cms/admin/autotag/autotag_namespace_perm.thtml
M public_html/layout/cms/profiles/contactauthorform.thtml
M public_html/layout/cms/profiles/contactuserform.thtml
Log Message:
-----------
Merge pull request #233 from matrox66/develop
Update language files and fix invalid button references
Compare:
https://github.com/glFusion/glfusion/compare/1e81580d42b0...88bcf7ceadc6
