mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
23,211 Commits 17 Branches 190 Tags
Commit Graph

23211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cesar G
80d5a1ec1f [ticket/13011] Do not apply bbcode to whole text when selecting first 2 chars. 
PHPBB3-13011
 2014-09-23 12:56:20 -07:00
Cesar G
f2a98339e2 Merge remote-tracking branch 'hanakin/ticket/12889' into develop-ascraeus 
* hanakin/ticket/12889:
  [ticket/12889] Fix multiple select lists
 2014-09-23 12:49:04 -07:00
Cesar G
2478eef550 Merge remote-tracking branch 'Senky/ticket/13082' into develop-ascraeus 
* Senky/ticket/13082:
  [ticket/13082] Repair fix
  [ticket/13082] Join classes
  [ticket/13082] move style to css file
  [ticket/13082] Replace float by text-align
 2014-09-23 12:48:23 -07:00
Cesar G
7307380091 Merge remote-tracking branch 'hanakin/ticket/13097' into develop-ascraeus 
* hanakin/ticket/13097:
  [ticket/13097] Add missing unit type
 2014-09-23 10:06:00 -07:00
hanakin
fb610f99df [ticket/12889] Fix multiple select lists 
PHPBB3-12889
 2014-09-23 17:24:26 +02:00
hanakin
aa1ffc9319 [ticket/13097] Add missing unit type 
PHPBB3-13097
 2014-09-23 17:11:51 +02:00
Joas Schilling
ef9e0e743a Merge pull request #2937 from Senky/ticket/13027 
[ticket/13027] PM folder full percentage could be a bit more accurate
 2014-09-23 15:32:14 +02:00
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
Jakub Senko
9a8a0af7ba [ticket/13094] Condition search properly 
PHPBB3-13094
 2014-09-22 21:12:18 +02:00
Marc Alexander
d03be5ea5f [ticket/13070] Use old 'template' class for template class hook 
PHPBB3-13070
 2014-09-22 20:03:55 +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
blitze
d6de9ce5d9 [ticket/13072] Add total_match_count to core.search_get_topic_data event 
PHPBB3-13072
 2014-09-21 08:22:15 +00:00
Jakub Senko
9f981a7741 [ticket/13082] Repair fix 
PHPBB3-13082
 2014-09-21 10:03:48 +02:00
blitze
6a33472214 [ticket/13071] Only use total_match_count after event dispatcher 
PHPBB3-13071
 2014-09-21 07:39:50 +00: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
Jakub Senko
6851ff8fab [ticket/13082] Join classes 
PHPBB3-13082
 2014-09-21 00:07:39 +02:00
n-aleha
7313cc777e [ticket/13085] Fix typo in oauth.php 
PHPBB3-13085
 2014-09-21 00:33:07 +03:00
Jakub Senko
ace3b806a9 [ticket/13082] move style to css file 
PHPBB3-13082
 2014-09-20 20:35:14 +02:00
Jakub Senko
ef58752db8 [ticket/13082] Replace float by text-align 
PHPBB3-13082
 2014-09-20 18:35:26 +02: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
Marc Alexander
457e13634e [ticket/12858] Properly format UTC offset in footer 
PHPBB3-12858
 2014-09-19 23:45:03 +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