mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-30 05:22:45 +02:00
Code Issues Releases Wiki Activity
20,268 Commits 18 Branches 191 Tags
Commit Graph

20268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joas Schilling
4b259e3c82 Merge remote-tracking branch 'dhruvgoel92/ticket/11288-develop' into develop 
* dhruvgoel92/ticket/11288-develop:
  [ticket/11288] Add unit test cases for foo-bar like queries
  [ticket/11288] Handle +,- without preceeding whitespace characters
 2014-03-11 09:48:24 +01:00
Joas Schilling
214f515e9c Merge remote-tracking branch 'dhruvgoel92/ticket/11288' into develop-olympus 
* dhruvgoel92/ticket/11288:
  [ticket/11288] Handle +,- without preceeding whitespace characters
 2014-03-11 09:46:31 +01:00
Joas Schilling
37b19bc533 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12259] Reduce the size of our test matrix

Conflicts:
	.travis.yml
 2014-03-11 09:15:33 +01:00
Joas Schilling
a35901c29b Merge remote-tracking branch 'EXreaction/ticket/12259-olympus' into develop-olympus 
* EXreaction/ticket/12259-olympus:
  [ticket/12259] Reduce the size of our test matrix
 2014-03-11 09:13:37 +01:00
Nathan Guse
052bbf654f Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop 
* remotes/upstream/develop-olympus:
  [ticket/12106] Combined first and second sentence
  [ticket/12106] Adds a explaination that admin/mods still able to use the board

Conflicts:
	phpBB/language/en/acp/board.php
 2014-03-10 21:51:07 -05:00
Nathan Guse
9aa947f7fb Merge pull request #2105 from Crizz0/ticket/12106 
[ticket/12106] Adds a explaination that admin/mods still able to use the...
 2014-03-10 21:49:29 -05:00
Nathan Guse
3181c44fc9 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10549] Adds language variables

Conflicts:
	phpBB/includes/functions_module.php
 2014-03-10 21:44:04 -05:00
Nathan Guse
ea63e1412b Merge pull request #2100 from Crizz0/ticket/10549 
[ticket/10549] Adds language variables to Error messages MODULE...
 2014-03-10 21:40:44 -05:00
Nathan Guse
a4810405d2 [ticket/12259] Reduce the size of our test matrix 
Only test MariaDB or PostgreSQL once on PHP 5.4. This reduces our build matrix
by 10 builds (over half).

PHPBB3-12259
 2014-03-10 21:34:55 -05:00
Nathan Guse
92b638ed83 Merge pull request #2107 from VSEphpbb/ticket/12117 
[ticket/12117] Add get_all_tree_data method to tree class
 2014-03-10 21:30:39 -05:00
Nathan Guse
00d86a4af1 [ticket/9871] Allow setting the host/file to load for the version class 
PHPBB3-9871
 2014-03-10 21:26:46 -05:00
Nathan Guse
1f7c891da2 [ticket/9871] Restore get_remote_file_test 
PHPBB3-9871
 2014-03-10 20:57:20 -05:00
Nathan Guse
23ea833425 Merge pull request #2101 from nickvergessen/ticket/10763 
[ticket/10763] Do not call non-static functions statically
 2014-03-10 20:51:20 -05:00
Nathan Guse
f7020fb5d1 Merge pull request #2092 from nickvergessen/ticket/12090 
[ticket/12090] Pass route name to url() instead of the url itself
 2014-03-10 20:50:08 -05:00
Matt Friedman
4127f92496 [ticket/12117] Select all fields instead of item_basic_data 
PHPBB3-12117
 2014-03-10 16:06:53 -07:00
Matt Friedman
c1115d9451 [ticket/12117] Add get_all_tree_data method to tree class 
PHPBB3-12117
 2014-03-10 15:59:45 -07:00
Joas Schilling
235f7c3721 Merge remote-tracking branch 'rxu3/ticket/12224' into develop 
* rxu3/ticket/12224:
  [ticket/12224] Add assign_block_vars_array() test.
  [ticket/12224] Add template wrapper method to assign block arrays
 2014-03-10 23:49:37 +01:00
Crizzo
957e9aabc3 [ticket/12106] Combined first and second sentence 
PHPBB3-12106
 2014-03-10 21:19:25 +01:00
Suhaib Khan
92fe7e61c2 [ticket/11666] Removing MESSAGE_DELETED.. 
..in /en/posting.php as it is not used.

PHPBB3-11666
 2014-03-10 23:42:56 +05:30
Crizzo
13327a13a0 [ticket/12106] Adds a explaination that admin/mods still able to use the board 
PHPBB3-12106
 2014-03-10 18:50:39 +01:00
Crizzo
ec4c9833ca [ticket/10549] Adds language variables 
PHPBB3-10549
 2014-03-10 18:35:23 +01:00
Joas Schilling
fe63ac888f [ticket/12261] Fix doc block 
PHPBB3-12261
 2014-03-10 17:09:28 +01:00
Joas Schilling
f43da31bba [ticket/12261] Validate the redirect hidden field before submitting the form 
PHPBB3-12261
 2014-03-10 15:27:48 +01:00
rxu
d29514f3e7 [ticket/12224] Add assign_block_vars_array() test. 
Add tests, also change return value to null.

PHPBB3-12224
 2014-03-10 20:59:45 +08:00
Joas Schilling
e8fdc1545a [ticket/12261] Add a functional test for redirect after using login_box() 
PHPBB3-12261
 2014-03-10 12:35:30 +01:00
Joas Schilling
b876c07377 [ticket/12261] Remove web root path from login redirect url 
The redirect url must be relative to the ucp.php and not relative to the
current page.

PHPBB3-12261
 2014-03-10 10:15:38 +01:00
Nathan Guse
c169583dc3 Merge pull request #2089 from nickvergessen/ticket/12251 
[ticket/12251] Clean up and Enhancement of Custom Profile Fields
 2014-03-09 17:26:22 -05:00
Nathaniel Guse
f3d8dfd1e3 [ticket/12202] Can't call htmlspecialchars before checking for quotes 
PHPBB3-12202
 2014-03-09 17:17:33 -05:00
Nathaniel Guse
50dd76aef3 [ticket/12202] Fix tests 
PHPBB3-12202
 2014-03-09 17:16:45 -05:00
Nathan Guse
20723a9315 Merge pull request #2099 from bantu/ticket/12256 
[ticket/12256] Selecting founders is fetching $sql instead of $result
 2014-03-09 16:55:28 -05:00
Crizzo
47ad92ae31 [ticket/8785] Fixed problem with add empty.png and travis will now pass 
PHPBB3-8785
 2014-03-09 22:14:40 +01:00
Joas Schilling
521c6c7d75 [ticket/10763] Do not call messenger::error() statically 
PHPBB3-10763
 2014-03-09 22:03:38 +01:00
Joas Schilling
37dace4967 [ticket/10763] Do not call non-static transfer() statically 
PHPBB3-10763
 2014-03-09 21:53:21 +01:00
Crizzo
0fd172aaa4 [ticket/8785] and again a fresh line 
PHPBB3-8785
 2014-03-09 21:50:44 +01:00
Joas Schilling
38aef98a69 [ticket/10763] Fix static calls to non static methods in colour_manager 
PHPBB3-10763
 2014-03-09 21:42:59 +01:00
Joas Schilling
12dc36903e [ticket/10763] Do not call set_post_visibility() statically 
PHPBB3-10763
 2014-03-09 21:38:32 +01:00
Forumhulp.com
86845e48a2 [ticket/12256] Selecting founders is fetching $sql instead of $result 
PHPBB3-12256
 2014-03-09 21:37:44 +01:00
Nathan Guse
49734db9cd [ticket/12202] Test for parse_cfg_file 
PHPBB3-12202
 2014-03-09 15:20:42 -05:00
Nathan Guse
224e3f139f [ticket/12202] Use copyright symbol in style.cfg files 
PHPBB3-12202
 2014-03-09 15:20:18 -05:00
Nathan Guse
f2d3879da4 [ticket/12202] Apply htmlspecialchars to style.cfg data 
PHPBB3-12202
 2014-03-09 15:19:52 -05:00
Crizzo
cc59b5e44b [ticket/8785] Just one blank line 
PHPBB3-8785
 2014-03-09 21:16:40 +01:00
Joas Schilling
bc74819cc9 [ticket/12251] Remove leading whitespace on doc blocks 
PHPBB3-12251
 2014-03-09 21:13:04 +01:00
Crizzo
b4a65da2ed [ticket/8785] pm_layout.html back to more standard code 
PHPBB3-8785
 2014-03-09 19:37:45 +01:00
Joas Schilling
0119a21862 [ticket/12090] Comment out broken test 
PHPBB3-12090
 2014-03-09 19:17:12 +01:00
Joas Schilling
b29c4c6358 [ticket/12090] Move find() call to container and fix tests 
PHPBB3-12090
 2014-03-09 19:03:15 +01:00
Joas Schilling
2eb24d0ace [ticket/12090] Split finding routes and returning routes into 2 methods 
PHPBB3-12090
 2014-03-09 18:38:21 +01:00
Joas Schilling
436b1d3577 [ticket/12090] Fix parameter list of controller helper constructor 
PHPBB3-12090
 2014-03-09 18:22:32 +01:00
Dhruv
baed78bde7 [ticket/11288] Add unit test cases for foo-bar like queries 
foo-bar and foo -bar are interpreted differently by
native search backend now.

PHPBB3-11288
 2014-03-09 22:30:22 +05:30
Crizzo
cace4a50d0 [ticket/8785] <hr /> will only displayed when needed 
PHPBB3-8785
 2014-03-09 17:59:49 +01:00
Dhruv
1688d88059 Merge branch 'ticket/11288' into ticket/11288-develop 
* ticket/11288:
  [ticket/11288] Handle +,- without preceeding whitespace characters
 2014-03-09 22:00:06 +05:30