Permalink
Browse files

Merge branch '1.6-next'

# Conflicts:
#	admin_bans.php
#	admin_maintenance.php
#	include/common.php
  • Loading branch information...
franzliedke committed Jan 4, 2019
2 parents 3909815 + 1ad12d2 commit c31c43033b10f59594bdc2a2f1730c7706b67e0d
Showing with 1,493 additions and 10,760 deletions.
  1. +13 −0 .editorconfig
  2. +602 −602 admin_bans.php
  3. +10 −17 admin_categories.php
  4. +1 −1 admin_censoring.php
  5. +6 −9 admin_forums.php
  6. +3 −3 admin_groups.php
  7. +8 −14 admin_maintenance.php
  8. +3 −3 admin_reports.php
  9. +14 −15 admin_users.php
  10. +61 −39 db_update.php
  11. +1 −1 delete.php
  12. +1 −1 edit.php
  13. +2 −2 extern.php
  14. +1 −1 footer.php
  15. +33 −32 help.php
  16. BIN img/smilies/big_smile.png
  17. BIN img/smilies/cool.png
  18. BIN img/smilies/hmm.png
  19. BIN img/smilies/lol.png
  20. BIN img/smilies/mad.png
  21. BIN img/smilies/neutral.png
  22. BIN img/smilies/roll.png
  23. BIN img/smilies/sad.png
  24. BIN img/smilies/smile.png
  25. BIN img/smilies/tongue.png
  26. BIN img/smilies/wink.png
  27. BIN img/smilies/yikes.png
  28. +2 −2 include/cache.php
  29. +1 −33 include/common.php
  30. +1 −7 include/dblayer/common_db.php
  31. +0 −378 include/dblayer/mysql.php
  32. +0 −392 include/dblayer/mysql_innodb.php
  33. +8 −17 include/dblayer/mysqli.php
  34. +8 −17 include/dblayer/mysqli_innodb.php
  35. +7 −15 include/dblayer/pgsql.php
  36. +8 −18 include/dblayer/sqlite.php
  37. +82 −108 include/functions.php
  38. +57 −27 include/parser.php
  39. +2 −2 include/search_idx.php
  40. +13 −7 include/srand.php
  41. +1 −1 index.php
  42. +12 −53 install.php
  43. +5 −5 lang/English/install.php
  44. +1 −1 lang/English/profile.php
  45. +1 −1 lang/English/register.php
  46. +1 −0 lang/English/update.php
  47. +11 −23 login.php
  48. +414 −414 misc.php
  49. +30 −20 moderate.php
  50. +4 −4 post.php
  51. +15 −15 profile.php
  52. +4 −4 register.php
  53. +14 −19 search.php
  54. +9 −53 style/Air.css
  55. +0 −1,150 style/Cobalt.css
  56. +9 −53 style/Earth.css
  57. +9 −53 style/Fire.css
  58. +0 −1,149 style/Lithium.css
  59. +0 −1,150 style/Mercury.css
  60. +0 −1,150 style/Oxygen.css
  61. +0 −1,150 style/Radium.css
  62. +0 −1,149 style/Sulfur.css
  63. +0 −1,373 style/Technetium.css
  64. BIN style/Technetium/bg.png
  65. BIN style/Technetium/dark-shade.png
  66. BIN style/Technetium/darker-shade.png
  67. BIN style/Technetium/feed.png
  68. BIN style/Technetium/icon-closed-sticky.png
  69. BIN style/Technetium/icon-closed.png
  70. BIN style/Technetium/icon-moved.png
  71. BIN style/Technetium/icon-new-sticky.png
  72. BIN style/Technetium/icon-new.png
  73. BIN style/Technetium/icon-nonew-sticky.png
  74. BIN style/Technetium/icon-nonew.png
  75. +0 −1 style/Technetium/index.html
  76. BIN style/Technetium/inv-shade.png
  77. BIN style/Technetium/light-shade.png
  78. +0 −1 style/imports/base_admin.css
  79. +1 −1 userlist.php
  80. +2 −2 viewforum.php
  81. +2 −2 viewtopic.php
@@ -0,0 +1,13 @@
# EditorConfig helps developers define and maintain consistent
# coding styles between different editors and IDEs
# editorconfig.org

root = true

[*]
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = tab
indent_size = 4
Oops, something went wrong.

0 comments on commit c31c430

Please sign in to comment.