makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
23125 commits 18 branches 192 tags 207 MiB
Commit graph

23125 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
820db008ff [ticket/13048] Only do not update the session page for ajax requests 
The session time still needs to be updated, so e.g. long upload times
with PLupload stop the session from timing out.

PHPBB3-13048
 2014-09-23 15:25:40 +02:00
Joas Schilling
05ae327553 Merge pull request #2974 from hanakin/ticket/13080 
[Ticket/13080] Fix text overflow issue in mobile
 2014-09-23 14:43:04 +02:00
Marc Alexander
9b8d8b020f Merge branch 'develop-olympus' into develop-ascraeus 2014-09-23 11:10:47 +02:00
Marc Alexander
92b096b05b Merge pull request #2984 from nickvergessen/ticket/10729-asc 
[3.1][ticket/10729] Update editor information when user being deleted
 2014-09-23 11:09:29 +02:00
Marc Alexander
8bd1853b56 Merge pull request #2981 from nickvergessen/ticket/10729 
Ticket/10729 Update editor information when user being deleted
 2014-09-23 11:08:56 +02:00
Joas Schilling
96024e88e9 [ticket/10729] Also test *delete_user on posts and topics 
PHPBB3-10729
 2014-09-23 09:54:21 +02:00
Joas Schilling
d6008e896a [ticket/10729] Fix handling of third parameter in 3.1 
PHPBB3-10729
 2014-09-23 09:42:30 +02:00
Joas Schilling
10b6399d30 [ticket/10729] Fix setup of the tests for 3.1 
PHPBB3-10729
 2014-09-23 09:38:35 +02:00
Joas Schilling
eeeb62b433 [ticket/10729] Update fixture to 3.1 database structure 
PHPBB3-10729
 2014-09-23 09:31:33 +02:00
Joas Schilling
9ff6358dc9 Merge branch 'ticket/10729' into ticket/10729-asc 
Conflicts:
	phpBB/includes/functions_user.php
 2014-09-23 09:31:13 +02:00
Joas Schilling
bea5f94de6 [ticket/10729] Use mocked null cache for phpunit 3.6 on travis with php 5.2 
PHPBB3-10729
 2014-09-23 09:03:44 +02:00
Joas Schilling
e28b93e0cc [ticket/10729] Ensure that no bans exist before testing create_session 
PHPBB3-10729
 2014-09-22 23:56:31 +02:00
Joas Schilling
7fca351e05 [ticket/10729] Add assert messages and finish up tests 
PHPBB3-10729
 2014-09-22 02:01:54 +02:00
Joas Schilling
d7c12ccd60 [ticket/10729] Add tests for some special tables with unique conditions 
PHPBB3-10729
 2014-09-22 01:42:36 +02:00
Joas Schilling
74854ac65d [ticket/10729] Add tests for user posts, reports and attachments 
PHPBB3-10729
 2014-09-22 00:55:34 +02:00
Joas Schilling
d48e4b680e [ticket/10729] Fix doc block for user_delete 
PHPBB3-10729
 2014-09-22 00:55:08 +02:00
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
hanakin
8b8e065441 [ticket/13080] Fix mediaqueries formating 
open { are should not to be on new lines for
media queries per spec, causes code highlight
issues in reputible code editors

PHPBB3-13080
 2014-09-20 16:55:20 +02:00
hanakin
e3eff2a976 [ticket/13080] Remove nowrap from dd in responsive 
PHPBB3-13080
 2014-09-20 16:51:01 +02: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 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