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,315 Commits 17 Branches 190 Tags
Commit Graph

23315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
n-aleha
752363b435 [ticket/12909] Use correct lang vars in cli extension enable 
PHPBB3-12909
 2014-08-03 09:53:18 +03:00
n-aleha
cf93b7e367 [ticket/12908] Fix operator typo in increment.php 
PHPBB3-12908
 2014-08-03 08:34:25 +03:00
n-aleha
2cc20fb977 [ticket/12557] Fix doc block in mimetype guesser 
PHPBB3-12557
 2014-08-03 07:13:21 +03:00
n-aleha
6d7689f581 [ticket/12557] Fix var $preserve_cr description 
PHPBB3-12557
 2014-08-03 07:13:21 +03:00
n-aleha
95ec9590df [ticket/12557] Fix doc block errors found by Sami 
PHPBB3-12557
 2014-08-03 07:13:20 +03:00
n-aleha
6ac8d17af6 [ticket/12557] Fix doc block errors found by Sami 
More corrections.

PHPBB3-12557
 2014-08-03 07:13:20 +03:00
n-aleha
c355b60c62 [ticket/12557] Fix doc block errors found by Sami 
More corrections.

PHPBB3-12557
 2014-08-03 07:13:20 +03:00
n-aleha
dfcbace621 [ticket/12557] Template fixes 
PHPBB3-12557
 2014-08-03 07:12:34 +03:00
n-aleha
8f2395857e [ticket/12557] Search, cron and profilefields fixes 
PHPBB3-12557
 2014-08-03 07:06:29 +03:00
n-aleha
f34bc924a6 [ticket/12557] Notification fixes 
PHPBB3-12557
 2014-08-03 07:03:08 +03:00
n-aleha
ffcf45abf3 [ticket/12557] Fix doc block errors found by Sami pt1 
PHPBB3-12557
 2014-08-03 07:03:08 +03:00
n-aleha
8ac8c9ec61 [ticket/12557] Fix doc block errors found by Sami 
More corrections.

PHPBB3-12557
 2014-08-03 06:57:05 +03:00
n-aleha
19b9df7e63 [ticket/12557] Fix doc block errors found by Sami 
PHPBB3-12557
 2014-08-03 06:57:05 +03:00
Joas Schilling
dd86615c63 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12895] Rename user style setting to resolve conflict with style param
 2014-08-02 13:56:30 +02:00
Joas Schilling
c991b1d587 Merge pull request #2782 from marc1706/ticket/12895 
[ticket/12895] Rename user style setting to resolve conflict with style param

* marc1706/ticket/12895:
  [ticket/12895] Rename user style setting to resolve conflict with style param
 2014-08-02 13:56:16 +02:00
Joas Schilling
e0f5a37d81 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12902] Remove duplicate entry in switch statement
 2014-08-02 13:46:22 +02:00
Joas Schilling
66f859d109 Merge branch 'ticket/JeroenDeDauw/12902' into develop-ascraeus 
* ticket/JeroenDeDauw/12902:
  [ticket/12902] Remove duplicate entry in switch statement
 2014-08-02 13:46:13 +02:00
jeroendedauw
626234aece [ticket/12902] Remove duplicate entry in switch statement 
PHPBB3-12902
 2014-08-02 13:44:51 +02:00
Marc Alexander
69682372bb Merge branch 'develop-ascraeus' into develop 2014-08-01 23:31:55 +02:00
Marc Alexander
ce2c31d18a Merge remote-tracking branch 'brunoais/ticket/12801' into develop-ascraeus 2014-08-01 23:31:31 +02:00
Marc Alexander
fab25164a0 Merge branch 'develop-ascraeus' into develop 2014-08-01 23:28:30 +02:00
Marc Alexander
5b2e962934 Merge remote-tracking branch 'brunoais/ticket/12800' into develop-ascraeus 2014-08-01 23:27:55 +02:00
Joas Schilling
76dbe95afc Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/11480] Header file
  [ticket/11480] Fix unit tests
  [ticket/11480] Move the test into get_folder()
  [ticket/11480] Fix the double spaces in phpbb_functional_test_case
  [ticket/11480] Fix typos
  [ticket/11480] Add functionnal test
  [ticket/11480] PM : "Unknown folder" returned when inbox folder is full
 2014-08-01 22:24:06 +02:00
Joas Schilling
50d10c4efd Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
 2014-08-01 22:23:53 +02:00
Joas Schilling
6ced579ab3 Merge pull request #2784 from Nicofuma/ticket/11480-ascraeus 
[ticket/11480-ascraeus] PM : "Unknown folder" returned when inbox folder is full

* Nicofuma/ticket/11480-ascraeus:
  [ticket/11480] Header file
  [ticket/11480] Fix unit tests
  [ticket/11480] Move the test into get_folder()
  [ticket/11480] Fix the double spaces in phpbb_functional_test_case
  [ticket/11480] Fix typos
  [ticket/11480] Add functionnal test
  [ticket/11480] PM : "Unknown folder" returned when inbox folder is full
 2014-08-01 22:23:36 +02:00
Joas Schilling
122898d221 Merge pull request #2350 from Nicofuma/ticket/11480 
[ticket/11480] PM : "Unknown folder" returned when inbox folder is full

* Nicofuma/ticket/11480:
  [ticket/11480] Move the test into get_folder()
  [ticket/11480] Fix the double spaces in phpbb_functional_test_case
  [ticket/11480] Fix typos
  [ticket/11480] Add functionnal test
  [ticket/11480] PM : "Unknown folder" returned when inbox folder is full
 2014-08-01 22:17:17 +02:00
brunoais
47bfe2999d [ticket/12801] Changed name change @since as requested 
Changed name to core.load_drafts_draft_list_result as requested

Changed @since to 3.1.0-RC3 because RC2 is already out.

PHPBB3-12801
 2014-08-01 11:12:29 +01:00
brunoais
25826fa587 [ticket/12880] Changed name change @since as requested 
Changed name to core.display_user_activity_modify_actives as requested

Changed @since to 3.1.0-RC3 because RC2 is already out.

PHPBB3-12880
 2014-08-01 11:09:26 +01:00
Marc Alexander
589cf73202 Merge branch 'develop-ascraeus' into develop 2014-07-31 21:40:37 +02:00
Marc Alexander
89557f5cac Merge remote-tracking branch 'VSE/ticket/12864' into develop-ascraeus 2014-07-31 21:39:48 +02:00
Tristan Darricau
cd0dad8951 [ticket/11480] Header file 
PHPBB3-11480
 2014-07-31 15:36:58 +02:00
Tristan Darricau
67d19920c4 [ticket/11480] Fix unit tests 
PHPBB3-11480
 2014-07-31 15:36:42 +02:00
Tristan Darricau
4328141fd2 [ticket/12693] The files skipped list can not be empty 
PHPBB3-12693
 2014-07-31 14:20:48 +02:00
Tristan Darricau
92106d52d0 [ticket/12693] Force the composer.phar to be executable 
PHPBB3-12693
 2014-07-31 14:20:46 +02:00
Tristan Darricau
5739a3da8f [ticket/12693] All the files in bin/ must be executable 
PHPBB3-12693
 2014-07-31 14:20:45 +02:00
Tristan Darricau
d284675241 [ticket/12693] Expand manually the wildcard 
PHPBB3-12693
 2014-07-31 14:20:44 +02:00
Tristan Darricau
6081175857 [ticket/12693] Fix the query for bin/* 
PHPBB3-12693
 2014-07-31 14:20:42 +02:00
Tristan Darricau
ffcc1e9d94 [ticket/12693] Extract exceptions, bin/* must be executable 
PHPBB3-12693
 2014-07-31 14:20:41 +02:00
Tristan Darricau
ae9c1cddc8 [ticket/12693] Remove the executable bit on icon_print.gif 
PHPBB3-12693
 2014-07-31 14:20:40 +02:00
Tristan Darricau
949264507d [ticket/12693] Check the persmissions of the owner 
PHPBB3-12693
 2014-07-31 14:20:38 +02:00
Tristan Darricau
30e13a429c [ticket/12693] Check if the are executable and not if they are 644 
PHPBB3-12693
 2014-07-31 14:20:37 +02:00
Tristan Darricau
f394f55fe2 [ticket/12693] Fix the permissions 
PHPBB3-12693
 2014-07-31 14:20:36 +02:00
Tristan Darricau
636eac2cd2 [ticket/12693] Check if the files have the right 644 
And not only if they are executable.

PHPBB3-12693
 2014-07-31 14:20:34 +02:00
Tristan Darricau
18207ae1ec [ticket/12693] Fix indentation 
PHPBB3-12693
 2014-07-31 14:20:33 +02:00
Tristan Darricau
a6f43d09d7 [ticket/12693] Add a travis test that checks file permissions 
PHPBB3-12693
 2014-07-31 14:20:32 +02:00
Joas Schilling
b9bb22e009 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12882] Use a new migration
  [ticket/12882] Update search_type when it's not prefixed by phpbb_search
 2014-07-31 14:03:31 +02:00
Joas Schilling
f4fc1bde03 Merge pull request #2767 from Nicofuma/ticket/12882 
[ticket/12882] Update search_type when it's not prefixed by phpbb_search

* Nicofuma/ticket/12882:
  [ticket/12882] Use a new migration
  [ticket/12882] Update search_type when it's not prefixed by phpbb_search
 2014-07-31 14:03:23 +02:00
Tristan Darricau
702d567c69 Merge branch 'ticket/11480' into ticket/11480-ascraeus 
* ticket/11480:
  [ticket/11480] Move the test into get_folder()
  [ticket/11480] Fix the double spaces in phpbb_functional_test_case
  [ticket/11480] Fix typos
  [ticket/11480] Add functionnal test
  [ticket/11480] PM : "Unknown folder" returned when inbox folder is full

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
 2014-07-30 21:01:05 +02:00
Tristan Darricau
8bdfda723c [ticket/11480] Move the test into get_folder() 
PHPBB3-11480
 2014-07-30 15:28:02 +02:00
Joas Schilling
c068da7353 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12492] Add support of special chars
 2014-07-30 15:01:27 +02:00