mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-17 22:28:46 +01:00
Code Issues Releases Wiki Activity
23,106 Commits 17 Branches 190 Tags
Commit Graph

23106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dhruv
c0d3cf6a27 [ticket/12962] Add UI tests to phpunit.xml.dist 
PHPBB3-12962
 2014-09-21 13:53:14 +05:30
Dhruv
f21ef60175 [ticket/12962] Add quick-links JS test 
PHPBB3-12962
 2014-09-21 13:53:08 +05:30
Dhruv
77f8bb48fe [ticket/12962] Add initial class for ui_testing 
PHPBB3-12962
 2014-09-21 12:07:06 +05:30
Dhruv Goel
84e68b3a73 Merge pull request #2963 from Senky/ticket/13045 
[ticket/13045] Remove Pragma headers
 2014-09-21 11:29:56 +05:30
Dhruv Goel
b02e579c1c Merge pull request #2976 from n-aleha/ticket/13085 
[ticket/13085] Fix typo in oauth.php
 2014-09-21 10:29:07 +05:30
n-aleha
7313cc777e [ticket/13085] Fix typo in oauth.php 
PHPBB3-13085
 2014-09-21 00:33:07 +03:00
Joas Schilling
e005455881 Merge branch 'prep-release-3.1.0-RC4' into develop-ascraeus 
* prep-release-3.1.0-RC4:
  [prep-release-3.1.0-RC4] Update phpBB Version for RC4 development
  [prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4
  [prep-release-3.1.0-RC4] Prepare Changelog
  [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4
  [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4
 2014-09-20 09:53:23 +02:00
Joas Schilling
26c6ffa458 [prep-release-3.1.0-RC4] Update phpBB Version for RC4 development 2014-09-20 09:52:53 +02:00
Joas Schilling
2c5e184ea1 [prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4 release-3.1.0-RC4 2014-09-19 19:09:46 +02:00
Joas Schilling
841abf712e [prep-release-3.1.0-RC4] Prepare Changelog 2014-09-19 19:07:41 +02:00
Joas Schilling
221f4a4a8c [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4 2014-09-19 19:04:21 +02:00
Joas Schilling
301694e922 [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4 2014-09-19 19:02:31 +02:00
Joas Schilling
fc252f1ba5 Merge pull request #2969 from marc1706/ticket/13073 
[ticket/13073] Correctly generate routes from subfolders like /adm

* marc1706/ticket/13073:
  [ticket/13073] Remove _test suffix from common test class
  [ticket/13073] Switch $input with $expected and add paths with letters
  [ticket/13073] Use abstract class for controller helper route tests
  [ticket/13073] Add path regex to get_preg_expression() and add unit tests
  [ticket/13073] Use just one regex in helper route()
  [ticket/13073] Properly place comments in helper
  [ticket/13073] Use correct class names in test files
  [ticket/13073] Rework route tests and add tests for more directory types
  [ticket/13073] Test that routes from subfolders like /adm work
  [ticket/13073] Add tests for routes from adm pages
  [ticket/13073] Add phpbb root path with mod rewrite enabled for proper routes
 2014-09-19 18:58:53 +02:00
Marc Alexander
3418683cfc [ticket/13073] Remove _test suffix from common test class 
PHPBB3-13073
 2014-09-19 16:50:26 +02:00
Marc Alexander
d720428564 [ticket/13073] Switch $input with $expected and add paths with letters 
PHPBB3-13073
 2014-09-19 15:30:24 +02:00
Marc Alexander
543d68a7d3 [ticket/13073] Use abstract class for controller helper route tests 
PHPBB3-13073
 2014-09-19 15:21:04 +02:00
Marc Alexander
6fd54436ee [ticket/13073] Add path regex to get_preg_expression() and add unit tests 
We're now calling get_preg_expression() instead of hardcoding the regex into
the helper route method.

PHPBB3-13073
 2014-09-19 13:54:15 +02:00
Marc Alexander
4186ced479 [ticket/13073] Use just one regex in helper route() 
PHPBB3-13073
 2014-09-19 12:14:57 +02:00
Marc Alexander
eaef881e7d [ticket/13073] Properly place comments in helper 
PHPBB3-13073
 2014-09-19 12:03:04 +02:00
Marc Alexander
de7ed7c286 [ticket/13073] Use correct class names in test files 
PHPBB3-13073
 2014-09-19 12:01:31 +02:00
Tristan Darricau
98f02ece97 Merge pull request #2970 from nickvergessen/ticket/13062 
[ticket/13062] Fix name of "ORDER_BY" key in SQL array

* nickvergessen/ticket/13062:
  [ticket/13062] Fix name of "ORDER_BY" key in SQL array
 2014-09-19 01:18:32 +02:00
Joas Schilling
6bc23ee282 [ticket/13062] Fix name of "ORDER_BY" key in SQL array 
PHPBB3-13062
 2014-09-19 00:56:16 +02:00
Marc Alexander
a6d9b42e5f [ticket/13073] Rework route tests and add tests for more directory types 
PHPBB3-13073
 2014-09-19 00:35:17 +02:00
Joas Schilling
e9285d43af Merge pull request #2952 from rxu/ticket/13066 
[ticket/13066] Add search results core event to modify search title

* rxu/ticket/13066:
  [ticket/13066] Add search results core event to modify search title
 2014-09-19 00:22:53 +02:00
Marc Alexander
d74f45aee0 [ticket/13073] Test that routes from subfolders like /adm work 
PHPBB3-13073
 2014-09-19 00:11:36 +02:00
Marc Alexander
a70addbf14 [ticket/13073] Add tests for routes from adm pages 
PHPBB3-13073
 2014-09-19 00:07:31 +02:00
Cesar G
ae14b0f272 Merge remote-tracking branch 'hanakin/ticket/12598' into develop-ascraeus 
* hanakin/ticket/12598:
  [ticket/12598] Fix sir typo
  [ticket/12598] Fix rtl positon in header
  [ticket/12598] Remove right border
  [ticket/12598] Remove border from .search-header
  [ticket/12598] Replace #search-box with class
  [ticket/12598] Remove hover border-color and use hover icon
  [ticket/12598] Add some responsive margin to give breathing room
  [ticket/12598] Clean up unused link colors
  [ticket/12598] Remove unused link colors
  [ticket/12598] Add lt IE9 fixes
  [ticket/12598] Improve search box styling
 2014-09-18 15:07:27 -07:00
Marc Alexander
d892dfe084 [ticket/13073] Add phpbb root path with mod rewrite enabled for proper routes 
PHPBB3-13073
 2014-09-18 23:44:51 +02:00
hanakin
1914a08088 [ticket/12598] Fix sir typo 
PHPBB3-12598
 2014-09-18 23:13:42 +02:00
hanakin
88f645eeda [ticket/12598] Fix rtl positon in header 
PHPBB3-12598
 2014-09-18 22:45:24 +02:00
hanakin
2ca001edcf [ticket/12598] Remove right border 
PHPBB3-12598
 2014-09-18 22:34:55 +02:00
hanakin
6eb2b876f1 [ticket/12598] Remove border from .search-header 
PHPBB3-12598
 2014-09-18 21:47:24 +02:00
hanakin
0dc181a529 [ticket/12598] Replace #search-box with class 
PHPBB3-12598
 2014-09-18 21:47:23 +02:00
PayBas
d27e9c7c76 [ticket/12598] Remove hover border-color and use hover icon 
PHPBB3-12598
 2014-09-18 21:47:23 +02:00
PayBas
93d50db2d6 [ticket/12598] Add some responsive margin to give breathing room 
PHPBB3-12598
 2014-09-18 21:47:22 +02:00
PayBas
b5800d1124 [ticket/12598] Clean up unused link colors 
PHPBB3-12598
 2014-09-18 21:47:22 +02:00
PayBas
3f71d7dba1 [ticket/12598] Remove unused link colors 
PHPBB3-12598
 2014-09-18 21:47:21 +02:00
PayBas
514bf6e39a [ticket/12598] Add lt IE9 fixes 
In case this one gets merged before hanakin's gradient PR.

PHPBB3-12598
 2014-09-18 21:47:21 +02:00
PayBas
470e6d5edf [ticket/12598] Improve search box styling 
PHPBB3-12598
 2014-09-18 21:47:20 +02:00
Joas Schilling
3066cd700a Merge pull request #2875 from PayBas/ticket/12961 
[ticket/12961] Add link in anti-spam ACP page which links directly to captchas in titania

* PayBas/ticket/12961:
  [ticket/12961] Shorten ext-db link text
  [ticket/12961] Fix missing phpBB.com
  [ticket/12961] Remove target="_blank" and switch to <strong>
  [ticket/12961] Add additional link to the KB
  [ticket/12961] Move link to language file
  [ticket/12961] Refactor lang entry
  [ticket/12961] Change url to anti-spam-ext
  [ticket/12961] Change url to https://www.phpbb.com/go/anti-spam/
  [ticket/12961] Add link in anti-spam ACP page to titania
 2014-09-18 14:23:41 +02:00
Tristan Darricau
bad07b355c Merge pull request #2967 from nickvergessen/ticket/12963 
[ticket/12963] Revert back to "migrations" folder name for extensions

* nickvergessen/ticket/12963:
  [ticket/12963] Always use core_path and core_directory()
  [ticket/12963] Remove old migration/ folder from tests
  [ticket/12963] Revert back to "migrations" folder name for extensions
 2014-09-18 14:04:06 +02:00
Joas Schilling
b82a3cddd8 Merge pull request #2927 from Senky/ticket/13022 
[ticket/13022] "Return to advanced search" wrong assumption

* Senky/ticket/13022:
  [ticket/13022] Language adjustments
  [ticket/13022] Remove ternary condition
  [ticket/13022] Condition Return to advanced search link
 2014-09-18 12:44:12 +02:00
Joas Schilling
1da5c41ab3 [ticket/12963] Always use core_path and core_directory() 
PHPBB3-12963
 2014-09-18 11:21:53 +02:00
Joas Schilling
5ce61e8c3a [ticket/12963] Remove old migration/ folder from tests 
PHPBB3-12963
 2014-09-18 11:21:51 +02:00
Joas Schilling
c220fa89a1 [ticket/12963] Revert back to "migrations" folder name for extensions 
The issues that can be created with the name change are just too much

PHPBB3-12963
 2014-09-18 10:45:08 +02:00
Cesar G
53e028ff14 Merge remote-tracking branch 'GiampaoloFalqui/develop-ascraeus' into develop-ascraeus 
* GiampaoloFalqui/develop-ascraeus:
  [ticket/13068] Language correction in FIELD_IS_CONTACT_EXPLAIN
 2014-09-17 18:17:56 -07:00
Cesar G
53f62f1129 Merge remote-tracking branch 'Nicofuma/ticket/12963' into develop-ascraeus 
* Nicofuma/ticket/12963:
  [ticket/12963] Fix the migration's finder for the tests (path, new instance)
 2014-09-17 17:49:01 -07:00
Giampaolo Falqui
a2b5ec7e1b [ticket/13068] Language correction in FIELD_IS_CONTACT_EXPLAIN 
PHPBB3-13068
 2014-09-18 02:25:39 +02:00
Tristan Darricau
0d1f0c07fe [ticket/12963] Fix the migration's finder for the tests (path, new instance) 
PHPBB3-12963
 2014-09-18 02:04:47 +02:00
Tristan Darricau
6c043c4a86 Merge pull request #2964 from nickvergessen/ticket/12963 
[ticket/12963] Correctly load migration files from migration/ in tests as well

* nickvergessen/ticket/12963:
  [ticket/12963] Correctly load migration files from migration/ in tests as well
 2014-09-18 01:32:08 +02:00