Commit graph

15042 commits

Author SHA1 Message Date
Michael Cullum
6a29de3f1b [feature/events] Adding simple_header_head acp template event
PHPBB3-9550
2012-12-17 11:37:20 -05:00
Michael Cullum
c7b2665160 [feature/events] Add users_overview_options acp template event
PHPBB3-9550
2012-12-17 11:37:19 -05:00
Michael Cullum
9ba18a21f0 [feature/events] Add overall_footer_end acp template event
PHPBB3-9550
2012-12-17 11:37:18 -05:00
Michael Cullum
44afff6b74 [feature/events] Adding overall_header_head acp template event
PHPBB3-9550
2012-12-17 11:37:16 -05:00
Michael Cullum
e6d1b07e2b [feature/events] Add main_actions acp template event
PHPBB3-9550
2012-12-17 11:37:15 -05:00
Michael Cullum
bc99e69f77 [feature/events] Add main_notice ACP template event
PHPBB3-9550
2012-12-17 11:37:14 -05:00
Michael Cullum
8012cd1d11 [feature/events] Move template ledges above </head> tag
PHPBB3-9550

Conflicts:

	phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
	phpBB/styles/prosilver/template/viewtopic_print.html
2012-12-17 11:37:13 -05:00
Michael Cullum
99cd766de0 [feature/events] Remove overall_head_head_body template ledge
PHPBB3-9550

Conflicts:

	phpBB/styles/prosilver/template/overall_header.html
2012-12-17 11:37:12 -05:00
Michael Cullum
8dcc2cded6 [feature/events] Rename RUNHOOKS to EVENT
Apply change to existing ledges

PHPBB3-9550
2012-12-17 11:37:11 -05:00
Joas Schilling
c0f900f695 [feature/events] Add forumlist_body_last_post in subsilver2
Used by NV Advanced Last Topic Titles

PHPBB3-9550
2012-12-17 11:37:09 -05:00
Joas Schilling
6ca65226e3 [feature/events] Fix forumlist_body_last_post in prosilver
Used by NV Advanced Last Topic Titles

PHPBB3-9550
2012-12-17 11:37:08 -05:00
Michael Cullum
47c1834382 [feature/events] Adding viewtopic_print_head_body template ledge
Needed by ReIMG Resizer

PHPBB3-9550
2012-12-17 11:37:07 -05:00
Michael Cullum
9b4ea94630 [feature/events] Adding ucp_pm_viewmessage_head_body template ledge
Needed by ReIMG Resizer

PHPBB3-9550
2012-12-17 11:37:06 -05:00
Michael Cullum
e865ee1bef [feature/events] Adding overall_head_head_body template ledge
Required by ReIMG Resizer

PHPBB3-9550
2012-12-17 11:37:05 -05:00
Michael Cullum
bc2f777b27 [feature/events] Adding simple_footer_end template ledge
PHPBB3-9550
2012-12-17 11:37:03 -05:00
Michael Cullum
244978cdb4 [feature/events] Adding overall_footer_end template ledge
Helpful for JS scripts that need to work with the DOM.

PHPBB3-9550
2012-12-17 11:37:02 -05:00
Michael Cullum
18af6dd664 [feature/events] Adding index_body_info_blocks template ledge
PHPBB3-9550
2012-12-17 11:37:01 -05:00
Michael Cullum
9e4043ff64 [feature/events] Adding forumlist_body_last_post template ledge
Used by NV Advanced Last Topic Titles

PHPBB3-9550
2012-12-17 11:36:59 -05:00
Michael Cullum
8534cbcc84 [feature/events] Adding overall_footer_index_link template ledge
Used by board3portal

PHPBB3-9550
2012-12-17 11:36:58 -05:00
Michael Cullum
bdd3e692fb [feature/events] Adding overall_header_index_link template ledge
Used by board3portal

PHPBB3-9550
2012-12-17 11:36:56 -05:00
Michael Cullum
f2ee104291 [feature/events] Add posting_editor_options template ledge
This is needed for options for posts and is used by topic as link MOD

PHPBB3-9550
2012-12-17 11:36:55 -05:00
Michael Cullum
fc2ebc34df [feature/events] Adds overall_footer_copyright template ledge
This allows people to add copyright information to the footer

PHPBB3-9550
2012-12-17 11:36:54 -05:00
Michael Cullum
c83c5c7f47 [feature/events] Add overall_header_nav template ledge
Adds a ledge next to the FAQ button for extensions to put links on the navigation bar

PHPBB3-9550
2012-12-17 11:36:53 -05:00
Oleg Pudeyev
38e146c8bd [feature/events] Added overall_header_head ledge.
This will be used by the trivial-css mod.

PHPBB3-9550
2012-12-17 11:36:52 -05:00
Oleg Pudeyev
da2f0757d7 Merge PR #1140 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8610] Update comment
  [ticket/8610] Do not use requests to submit posts except in posting_test.php
  [ticket/8610] Move posting helpers to separate file
  [ticket/8610] Create helper functions to create topic/post in functional tests
  [ticket/8610] Use phpbb_update_rows_avoiding_duplicates
  [ticket/8610] Revert some funky merging I did from rebase
  [ticket/8610] Add some comments
  [ticket/8610] Update Bookmarks and Subscriptions when splitting topics
  [ticket/8610] Update Bookmarks when merging posts into another topic
  [ticket/8610] Update Bookmarks when forking topics
  [ticket/8610] Update Bookmarks when merging topics
2012-12-16 16:48:15 -05:00
Oleg Pudeyev
a288c4b66b Merge PR #1140 branch 'EXreaction/ticket/8610' into develop-olympus
* EXreaction/ticket/8610:
  [ticket/8610] Update comment
  [ticket/8610] Do not use requests to submit posts except in posting_test.php
  [ticket/8610] Move posting helpers to separate file
  [ticket/8610] Create helper functions to create topic/post in functional tests
  [ticket/8610] Use phpbb_update_rows_avoiding_duplicates
  [ticket/8610] Revert some funky merging I did from rebase
  [ticket/8610] Add some comments
  [ticket/8610] Update Bookmarks and Subscriptions when splitting topics
  [ticket/8610] Update Bookmarks when merging posts into another topic
  [ticket/8610] Update Bookmarks when forking topics
  [ticket/8610] Update Bookmarks when merging topics
2012-12-16 16:24:48 -05:00
Nathan Guse
0f35f94398 Merge remote-tracking branch 'remotes/bantu/ticket/11273' into develop
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11273:
  [ticket/11273] Add space before MiB to Sphinx "Indexer memory limit" input box.
2012-12-15 17:07:01 -06:00
Andreas Fischer
0666499468 [ticket/11273] Add space before MiB to Sphinx "Indexer memory limit" input box.
PHPBB3-11273
2012-12-15 23:54:49 +01:00
Nathan Guse
649e009f7b [ticket/8610] Update comment
PHPBB3-8610
2012-12-15 16:23:48 -06:00
Nathan Guse
175b6deb6d [ticket/8610] Do not use requests to submit posts except in posting_test.php
Moving my functional test functions from posting_helpers.php to
posting_test.php since it is a bit nicer and more reusable if
posting_test.php is to be expanded in the future.

PHPBB3-8610
2012-12-15 16:22:54 -06:00
Nathan Guse
b6778802b3 Merge remote-tracking branch 'remotes/Oleg/ticket/11162' into develop
# By Oleg Pudeyev
# Via Oleg Pudeyev
* remotes/Oleg/ticket/11162:
  [ticket/11162] Chase dbal autoloading changes in develop.
2012-12-15 10:48:06 -06:00
Andreas Fischer
762cb074c3 Merge remote-tracking branch 'p/ticket/11268' into develop
* p/ticket/11268:
  [ticket/11268] Delete phpbb_db_driver_mysql4 as there is no such thing.
2012-12-15 01:35:30 +01:00
Oleg Pudeyev
d1eb3449af [ticket/11268] Delete phpbb_db_driver_mysql4 as there is no such thing.
PHPBB3-11268
2012-12-14 14:05:46 -05:00
Oleg Pudeyev
85248cd63d Merge PR #1142 branch 'nickvergessen/ticket/11250' into develop
* nickvergessen/ticket/11250:
  [ticket/11250] Use user defined message as incomplete message
  [ticket/11250] Add tests for simple nesting and code
  [ticket/11250] Run tests by default and add an option for incomplete ones
  [ticket/11250] Fix parsing result with special chars
  [ticket/11250] Add tests for size and attachment
  [ticket/11250] Fix method names
  [ticket/11250] Add some comments and fix a description
  [ticket/11250] Add some more tests for quotes
  [ticket/11250] Move quote special cases from class to unit tests
  [ticket/11250] Add parsing tests for our basic bbcodes in simple cases
2012-12-14 13:31:16 -05:00
Joas Schilling
ebe1f5d8da [ticket/11250] Use user defined message as incomplete message
PHPBB3-11250
2012-12-14 18:31:12 +01:00
Joas Schilling
4f080ba0d6 [ticket/11250] Add tests for simple nesting and code
PHPBB3-11250
2012-12-14 14:29:11 +01:00
Joas Schilling
8bbf3a788f [ticket/11250] Run tests by default and add an option for incomplete ones
PHPBB3-11250
2012-12-14 13:59:48 +01:00
Joas Schilling
1e5da1417a [ticket/11250] Fix parsing result with special chars
: . and [ are replaced by their html representation if they are text only

PHPBB3-11250
2012-12-14 13:58:39 +01:00
Joas Schilling
cce821f99d [ticket/11250] Add tests for size and attachment
PHPBB3-11250
2012-12-14 13:09:56 +01:00
Joas Schilling
bf312b5293 [ticket/11250] Fix method names
PHPBB3-11250
2012-12-14 13:04:44 +01:00
Joas Schilling
90a81a064b [ticket/11250] Add some comments and fix a description
PHPBB3-11250
2012-12-14 13:03:10 +01:00
Joas Schilling
deceeb7373 [ticket/11250] Add some more tests for quotes
PHPBB3-11250
2012-12-14 13:00:14 +01:00
Joas Schilling
ade9f831aa [ticket/11250] Move quote special cases from class to unit tests
PHPBB3-11250
2012-12-14 12:58:57 +01:00
Joas Schilling
754dc9c159 [ticket/11250] Add parsing tests for our basic bbcodes in simple cases
PHPBB3-11250
2012-12-14 12:56:42 +01:00
Nathan Guse
d739745ea4 [ticket/8610] Move posting helpers to separate file
This is to prevent cluttering up the functional test case class more

PHPBB3-8610
2012-12-13 23:09:45 -06:00
Nathan Guse
9eb9fa2b9d [ticket/8610] Create helper functions to create topic/post in functional tests
This will be used to test splitting/copying/merging/etc in functional tests

Also convert functional posting_test.php to use these functions

PHPBB3-8610
2012-12-13 22:38:17 -06:00
Nathan Guse
2469225a72 Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610
# By Oleg Pudeyev (29) and others
# Via Andreas Fischer (3) and others
* 'develop-olympus' of github.com:phpbb/phpbb3: (36 commits)
  [ticket/11262] Add .lock in cache directory to .gitignore
  [ticket/11265] Add assertions for board installation success.
  [ticket/11162] Reformat.
  [ticket/10491] Make recreate_database static.
  [ticket/11162] Rename tricky updates to database helper.
  [ticket/10491] Install board once per test run.
  [ticket/10972] Drop user deletion.
  [ticket/10972] Tweak user addition.
  [ticket/10972] Add destroy method to mock cache.
  [ticket/10972] Add mock null cache.
  [ticket/10972] Backport get_db from develop.
  [ticket/10972] Added explicit checks for creating duplicate users.
  [ticket/10972] Moved tests into appropriate places and added comments
  [ticket/10972] Added methods for creating and deleting basic users
  [ticket/11162] Use empty($queries).
  [ticket/11162] Review comments fixed.
  [ticket/11162] Reformat.
  [ticket/11162] Newlines to LF.
  [ticket/11162] Use correct functions.
  [ticket/11162] Account for notify_status.
  ...

Conflicts:
	phpBB/includes/mcp/mcp_topic.php
2012-12-13 20:46:25 -06:00
Nathan Guse
a50907250e [ticket/8610] Use phpbb_update_rows_avoiding_duplicates
PHPBB3-8610
2012-12-13 20:42:10 -06:00
Nathan Guse
5c614ff624 [ticket/8610] Revert some funky merging I did from rebase
PHPBB3-8610
2012-12-13 20:32:43 -06:00
Oleg Pudeyev
5e38317dcf [ticket/11162] Chase dbal autoloading changes in develop.
PHPBB3-11162
2012-12-13 21:27:30 -05:00