1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

16661 Commits

Author SHA1 Message Date
Nathan Guse
ad69d5af8a Merge pull request #1788 from VSEphpbb/ticket/11935
[ticket/11935] Fix invalid HTML and Errors
2013-11-04 09:43:34 -08:00
Nathan Guse
817a21dcfc Merge pull request #1826 from imkingdavid/ticket/11975
[ticket/11975] Add ACP link next to MCP link in header
2013-11-04 09:38:32 -08:00
Dhruv
27e54f9473 Merge remote-tracking branch 'prototech/ticket/11899' into develop
# By Cesar G
# Via Cesar G
* prototech/ticket/11899:
  [ticket/11899] Give indication of activity after voting in poll.
2013-11-04 00:42:59 +05:30
Dhruv
0e0e12963a Merge remote-tracking branch 'prototech/ticket/11928' into develop
# By Cesar G
# Via Cesar G
* prototech/ticket/11928:
  [ticket/11928] Javascript requires camel case.
  [ticket/11928] Rename loadingAlert to loading_indicator.
  [ticket/11928] Make sure the indicator is on top of other elements.
  [ticket/11928] Replace AJAX loading popup with animation.
2013-11-04 00:28:02 +05:30
Cesar G
478c3ea3a0 [ticket/11928] Javascript requires camel case.
PHPBB3-11928
2013-11-03 10:49:28 -08:00
Dhruv
efe94e9c73 Merge remote-tracking branch 'nickvergessen/ticket/11973' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11973:
  [ticket/11973] Remove logic from tokens language array
2013-11-04 00:11:23 +05:30
Andreas Fischer
e02836b19c Merge remote-tracking branch 'Noxwizard/ticket/11990' into develop
* Noxwizard/ticket/11990:
  [ticket/11990] Remove result_mssqlnative usage in acp_database.php
2013-11-03 18:09:44 +01:00
Joas Schilling
478d4971a6 Merge remote-tracking branch 'cyberalien/ticket/11977' into develop
* cyberalien/ticket/11977:
  [ticket/11977] Remove data and change code in acp_modules
  [ticket/11977] Use CSS instead of JS to disable up/down icons
2013-11-03 15:08:05 +01:00
Vjacheslav Trushkin
a6117c51b9 [ticket/11977] Remove data and change code in acp_modules
PHPBB3-11977
2013-11-03 15:36:20 +02:00
Patrick Webster
ad44407b19 [ticket/11990] Remove result_mssqlnative usage in acp_database.php
The class result_mssqlnative was removed in ticket 11980. This removes
the dependency on that class from the database backup utility. It is
possible to use the sqlsrv functions to retrieve the field information,
but they must be then mapped back to type names. That mapping was removed
in 11980 and it is easier to just look it up in the information schema
table.

PHPBB3-11990
2013-11-03 00:37:18 -05:00
David King
6ee8f19fea [ticket/11975] Remove copy/paste fail, fix tests
PHPBB3-11975
2013-11-02 15:53:40 -07:00
David King
47f7992bf1 [ticket/11975] Change shortened ACP/MCP label to Administer/Moderate
Also utilizing the new data-responsive-text attribute

PHPBB3-11975
2013-11-02 15:34:19 -07:00
David King
54e82392f0 [ticket/11975] Make link text shorter on smaller resolutions
PHPBB3-11975
2013-11-02 15:34:18 -07:00
David King
abd035fcc9 [ticket/11975] Add ACP link next to MCP link in header
PHPBB3-11975
2013-11-02 15:34:18 -07:00
David King
37aff2077a [ticket/11972] Fix the sinces
PHPBB3-11972
2013-11-02 15:27:53 -07:00
David King
567d4dab99 [ticket/11972] Add the sinces
PHPBB3-11972
2013-11-02 15:27:53 -07:00
David King
835900123e [ticket/11972] Add posting_editor_message_after template event
PHPBB3-11972
2013-11-02 15:27:53 -07:00
David King
b8eeca7048 [ticket/11972] Add posting_editor_message_before template event
PHPBB3-11972
2013-11-02 15:27:53 -07:00
David King
3be5fe5354 [ticket/11972] Add posting_editor_subject_before template event
PHPBB3-11972
2013-11-02 15:27:53 -07:00
David King
069f806169 [ticket/11972] Add posting_editor_subject_after template event
PHPBB3-11972
2013-11-02 15:27:52 -07:00
Cesar G
66c08de4cb [ticket/11746] The IN_PHPBB check is not necessary.
PHPBB3-11746
2013-11-02 13:50:09 -07:00
Nathan Guse
2e9b39285d Merge pull request #1840 from cyberalien/ticket/11030
Fix cursor in prosilver and ACP
2013-11-02 13:36:18 -07:00
Vjacheslav Trushkin
b225dd37d7 [ticket/11977] Use CSS instead of JS to disable up/down icons
PHPBB3-11977
2013-11-02 22:31:39 +02:00
Nathan Guse
25995e311c Merge pull request #1790 from prototech/ticket/11280
[ticket/11280] Prevent duplicate entry in forums_track table.
2013-11-02 12:10:19 -07:00
Nathan Guse
0a3bb18e93 Merge pull request #1812 from prototech/ticket/11746
[ticket/11746] Add "admin activation required" notification.
2013-11-02 11:55:16 -07:00
Joas Schilling
414a4d587e [ticket/11995] Fix Revert of config.remove
PHPBB3-11995
2013-11-02 18:13:11 +01:00
Joas Schilling
8a78699f6c Merge remote-tracking branch 'brunoais/ticket/11663' into develop
* brunoais/ticket/11663:
  [ticket/11663] Add the doc block about the parameters.
  [ticket/11663] Add the doc block about the return value.
  [ticket/11663] Make generate_text_for_storage return the errors.
2013-11-02 16:26:29 +01:00
Nils Adermann
158c998216 Merge pull request #1810 from nickvergessen/ticket/11031
Ticket/11031 Bring phpBB2 converter up to speed with 3.1 changes
2013-11-02 07:20:15 -07:00
Joas Schilling
481d25d885 [ticket/11031] Convert user notification options with default settings
PHPBB3-11031
2013-11-02 13:30:29 +01:00
Joas Schilling
cb8cd50495 [ticket/11031] Correctly add groups to teampage
PHPBB3-11031
2013-11-02 13:25:46 +01:00
Marc Alexander
54b7b2320c [ticket/11983] Add missing argument to docblock in ucp_notifications
The argument $subscriptions was not documented in the docblock of the method
output_notification_types() until now.

PHPBB3-11983
2013-11-02 10:42:16 +01:00
Nils Adermann
e118b4f4c0 Merge pull request #1839 from bantu/task/code-sniffer
More PHP Code Sniffer rules
2013-11-01 07:58:18 -07:00
Marcus Vinny
e4008308fc [ticket/11992] Fix Users with most Warnings block
PHPBB3-11992
2013-10-31 15:30:02 -03:00
Andreas Fischer
ae7ef3e09d [task/code-sniffer] Remove class result_mssqlnative.
PHPBB3-11980
2013-10-31 00:48:03 +01:00
Andreas Fischer
d499db36a0 Merge remote-tracking branch 'prototech/ticket/11987' into develop
* prototech/ticket/11987:
  [ticket/11987] Add {ADMIN_ROOT_PATH}.
  [ticket/11987] Replace {PHPBB_ROOT_PATH} with {ROOT_PATH}.
  [ticket/11987] Change {ROOT_PATH} to point to board root.
2013-10-31 00:44:58 +01:00
Cesar G
831075e5fe [ticket/11987] Add {ADMIN_ROOT_PATH}.
PHPBB3-11987
2013-10-30 16:13:20 -07:00
Cesar G
05dd4d55d2 [ticket/11987] Replace {PHPBB_ROOT_PATH} with {ROOT_PATH}.
PHPBB3-11987
2013-10-30 15:43:07 -07:00
Cesar G
7251feab67 [ticket/11987] Change {ROOT_PATH} to point to board root.
PHPBB3-11987
2013-10-30 15:42:35 -07:00
Cesar G
4b024f035e [ticket/11928] Rename loadingAlert to loading_indicator.
PHPBB3-11928
2013-10-30 15:28:11 -07:00
Cesar G
a95306643e [ticket/11991] Fix incorrect class name for report_post_closed notification.
PHPBB3-11991
2013-10-30 15:17:08 -07:00
Dhruv
a9524d6e08 Merge remote-tracking branch 'nickvergessen/ticket/11974' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11974:
  [ticket/11974] Fix timezone names with underscores
  [ticket/11974] Translate all timezones
2013-10-30 22:43:25 +05:30
Andreas Fischer
ef1f991837 [task/code-sniffer] Replace spaces with tabs.
PHPBB3-11980
2013-10-30 13:37:29 +01:00
Andreas Fischer
7aa8f6461f [task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.
PHPBB3-11980
2013-10-30 13:05:28 +01:00
Vjacheslav Trushkin
7ce34f3f90 [ticket/11030] Fix cursor for checkboxes
PHPBB3-11030
2013-10-30 11:51:16 +02:00
Matt Friedman
16213c92fe [ticket/11935] Merge remote-tracking branch 'upstream/develop'
PHPBB3-11935
2013-10-29 19:12:32 -07:00
erangamapa
dffe790f19 [ticket/11030] Fixing cursor appearing in file upload browse button.
Removed unnecessary cursor CSS properties added for form inputs in both acp
and prosilver styles. Added cursor:pointer property only for buttons.

PHPBB3-11030
2013-10-30 02:10:47 +02:00
Andreas Fischer
02e9f6e284 [task/code-sniffer] Fix argument list spacing.
PHPBB3-11980
2013-10-29 23:38:05 +01:00
Cesar G
57fc62b000 [ticket/11928] Make sure the indicator is on top of other elements.
PHPBB3-11928
2013-10-29 10:11:29 -07:00
Cesar G
da4e0c4219 [ticket/11928] Replace AJAX loading popup with animation.
PHPBB3-11928
2013-10-29 07:27:08 -07:00
Cesar G
68d80f9952 [ticket/11986] Fix undefined index: poster_id in file.php.
PHPBB3-11986
2013-10-29 06:02:04 -07:00