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

14829 commits

Author SHA1 Message Date
Vjacheslav Trushkin
858f644c38 [ticket/11533] Fix colspan and unnecessary tables 
Fix colspan and remove unnecessary tables in notification
settings page in subsilver2.

PHPBB3-11533
 2013-05-11 23:32:55 +03:00
Vjacheslav Trushkin
f129fdb559 [ticket/11533] Change list to table for notification settings 
PHPBB3-11533
 2013-05-11 23:32:23 +03:00
Vjacheslav Trushkin
b40c6fe46a [ticket/11533] Columns counter for notification settings 
Add columns counter template variable. It counts number of
notification types + column for name + column for checkbox

PHPBB3-11533
 2013-05-11 23:30:44 +03:00
Nils Adermann
3327739290 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.
  [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
  [ticket/11513] Use PHPUnit from composer in .travis.yml.
  [ticket/11513] Update (all) composer dependencies.
  [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.

Conflicts:
	.travis.yml
	phpBB/composer.lock
 2013-05-09 19:42:13 +02:00
Andreas Fischer
a42514105d [ticket/11513] Update (all) composer dependencies. 
PHPBB3-11513
 2013-05-09 18:46:29 +02:00
Andreas Fischer
585f0bc827 [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency. 
PHPBB3-11513
 2013-05-09 18:42:35 +02:00
Nils Adermann
dbb4a87b79 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11526] Update all dependencies / regenerate composer.lock.
  [ticket/11526] Increase composer minimum stability in olympus to stable.
  [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
 2013-05-09 18:12:54 +02:00
Andreas Fischer
5ea75ddf09 [ticket/11526] Update all dependencies / regenerate composer.lock. 
PHPBB3-11526
 2013-05-09 02:48:38 +02:00
Andreas Fischer
b3d16f21a8 [ticket/11526] Increase composer minimum stability in olympus to stable. 
PHPBB3-11526
 2013-05-09 02:48:31 +02:00
Oleg Pudeyev
6821a27ccf Merge PR #1294 branch 'VSEphpbb/ticket/10155' into develop 
# By Matt Friedman
# Via Matt Friedman
* VSEphpbb/ticket/10155:
  [ticket/10155] Update copyright in new migration file to 2013
  [ticket/10155] Make effectively installed test more specific
  [ticket/10155] Use more descriptive title for migration file
  [ticket/10155] Use new migration file for jQuery config update
  [ticket/10155] Update jQuery to 1.8.3
 2013-05-08 19:35:59 -04:00
Oleg Pudeyev
88d4964f0e Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into develop 
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/10325:
  [ticket/10325] move migration into a new file
  [ticket/10325] fix acp language
  [ticket/10325] use assert_response_success parts
  [ticket/10325] fix language in acp and ucp
  [ticket/10325] add assert_response_success in test
  [ticket/10325] functional tests for forgot password functionality
  [ticket/10325] add logout function in functional_test_case
  [ticket/10325] fix language in acp and ucp
  [ticket/10325] improve acp option language
  [ticket/10325] fix language key
  [ticket/10325] fix language variable
  [ticket/10325] change language var
  [ticket/10325] fix language
  [ticket/10325] add new config value to database
  [ticket/10325] trigger error if forgot password option disabled
  [ticket/10325] add allow forgot password option in acp
 2013-05-08 08:23:11 -04:00
Oleg Pudeyev
1a062c5064 Merge PR #1308 branch 'nickvergessen/ticket/11450' into develop 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11450:
  [ticket/11450] Limit scopes of filters and add better docs
  [ticket/11450] Use helpers to copy/remove files
  [ticket/11450] Move mocked class into mock/metadata_manager.php
  [ticket/11450] Add new line at end of file
  [ticket/11450] Fix tests class name
  [ticket/11450] Require db_tools file to be included
  [ticket/11450] Add test for unexisting composer.json
  [ticket/11450] Test the extensions details page in ACP Customise Tab
  [ticket/11450] Fix all instances of phpbb_extension_metadata_manager
  [ticket/11450] Fix doc blocks and add missing class var $config
  [ticket/11450] Sort parameters alphabetically
  [ticket/11450] Remove unused $db and $phpEx from metadata_manager construct()
 2013-05-08 08:17:39 -04:00
Dhruv
284011ebf2 [ticket/10325] move migration into a new file 
PHPBB3-10325
 2013-05-08 17:04:03 +05:30
Joas Schilling
62f35121d9 [ticket/11450] Fix all instances of phpbb_extension_metadata_manager 
PHPBB3-11450
 2013-05-08 08:47:21 +02:00
Joas Schilling
001e3ebe9e [ticket/11450] Fix doc blocks and add missing class var $config 
PHPBB3-11450
 2013-05-08 08:46:04 +02:00
Joas Schilling
5794b3d621 [ticket/11450] Sort parameters alphabetically 
PHPBB3-11450
 2013-05-08 08:46:03 +02:00
Joas Schilling
b63a148e08 [ticket/11450] Remove unused $db and $phpEx from metadata_manager construct() 
PHPBB3-11450
 2013-05-08 08:46:02 +02:00
Joas Schilling
1834ceb614 [ticket/11442] Use button name as indicator instead of css classes 
This leaves it up to the style authors how to style any buttons, without
messing up any functionality.

PHPBB3-11442
 2013-05-08 00:08:35 +02:00
Joas Schilling
665352d0d1 [ticket/11442] Do not suggest an option on ajax confirm box 
Reverting commit cb13add269
Also fixing in prosilver and subsilver2

PHPBB3-11442
 2013-05-08 00:07:13 +02:00
Oleg Pudeyev
7a881183d8 Merge PR #1375 branch 'marc1706/ticket/11442' into develop 
# By marc1706
# Via marc1706
* marc1706/ticket/11442:
  [ticket/11442] Use correct button class for ajaxified confirm_box
 2013-05-07 16:30:48 -04:00
Andreas Fischer
5fba9c22dd Merge remote-tracking branch 'p-push/ticket/11435' into develop 
* p-push/ticket/11435:
  [ticket/11435] Fit comment into 80 columns and link to php manual.
 2013-05-06 22:25:41 +02:00
Andreas Fischer
a97d9d4b89 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11144] Add missing {FORUM_NAME} variable
  [ticket/11144] Add missing {FORUM_NAME} variable

Conflicts:
	phpBB/download/file.php
	phpBB/styles/prosilver/template/login_forum.html
 2013-05-06 22:11:33 +02:00
Andreas Fischer
841f1e4922 Merge remote-tracking branch 'MGaetan89/ticket/11144' into develop-olympus 
* MGaetan89/ticket/11144:
  [ticket/11144] Add missing {FORUM_NAME} variable
  [ticket/11144] Add missing {FORUM_NAME} variable
 2013-05-06 21:56:20 +02:00
Gaëtan Muller
eefcdfa54a [ticket/11144] Add missing {FORUM_NAME} variable 
Replace spaces with tabs

PHPBB3-11144
 2013-05-06 21:50:45 +02:00
Oleg Pudeyev
01eded7cc2 Merge PR #1388 branch 'dhruvgoel92/ticket/11288' into develop 
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/11288:
  [ticket/11288] fix regex in postgres
  [ticket/11288] add search tests cases
 2013-05-06 15:46:00 -04:00
Gaëtan Muller
828d3b6b68 [ticket/11144] Add missing {FORUM_NAME} variable 
The template variable {FORUM_NAME} was missing from
the login page of a password protected forum

PHPBB3-11144
 2013-05-06 21:31:16 +02:00
Matt Friedman
153be855ca [ticket/10155] Update copyright in new migration file to 2013 
PHPBB3-10155
 2013-05-06 09:49:37 -07:00
Dhruv
bfdc6e1930 [ticket/11288] fix regex in postgres 
Postgres search backend now uses updated regex being used by
mysql search backend.

PHPBB3-11288
 2013-05-04 20:11:12 +05:30
Dhruv
00d5cde04e [ticket/10325] fix acp language 
PHPBB3-10325
 2013-05-04 14:44:33 +05:30
Nils Adermann
7320e4a535 Merge pull request #1348 from nickvergessen/ticket/11495 
Ticket/11495 Nested Set Implementation
 2013-05-02 15:04:19 -07:00
Andreas Fischer
1dea12d607 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11517] Fix list numbering
 2013-05-02 23:13:27 +02:00
hjpotter92
6d4a75b3cb [ticket/11517] Fix list numbering 
PHPBB3-11517
 2013-05-02 06:29:32 +05:30
Oleg Pudeyev
32f247ed60 [ticket/11435] Fit comment into 80 columns and link to php manual. 
PHPBB3-11435
 2013-05-01 17:21:49 -04:00
Joas Schilling
d7787682df [ticket/11495] Throw exception when item that should be deleted does not exist 
PHPBB3-11495
 2013-04-30 22:19:35 +02:00
Dhruv
a90a0b087c [ticket/10325] fix language in acp and ucp 
PHPBB3-10325
 2013-04-30 22:59:32 +05:30
Joas Schilling
6a7378ecbd [ticket/11495] Some more doc changes 
PHPBB3-11495
 2013-04-30 18:39:22 +02:00
Joas Schilling
2f54a63b0f [ticket/11495] Fix more grammar issues in doc blocks 
PHPBB3-11495
 2013-04-30 18:24:54 +02:00
Joas Schilling
98e6207c35 [ticket/11495] Fix "as well" typo and remove brackets 
PHPBB3-11495
 2013-04-30 18:13:32 +02:00
Joas Schilling
5c4d69581a [ticket/11495] Do not reset item_parent if not required 
PHPBB3-11495
 2013-04-30 18:06:29 +02:00
Joas Schilling
f3f7be4cd1 [ticket/11495] Fix @return doc of get_sql_where() 
PHPBB3-11495
 2013-04-30 17:11:55 +02:00
Joas Schilling
6055a3cc7e [ticket/11495] Remove useless release_lock() method 
PHPBB3-11495
 2013-04-30 16:19:25 +02:00
Joas Schilling
78b0d3e723 [ticket/11495] Use $lock->owns_lock() instead of own property 
PHPBB3-11495
 2013-04-30 15:50:14 +02:00
Joas Schilling
714092ab4e [ticket/11495] Add owns_lock() method to lock classes 
PHPBB3-11495
 2013-04-30 15:48:29 +02:00
Joas Schilling
055ee41065 [ticket/11495] Remove useless cast 
PHPBB3-11495
 2013-04-30 15:16:41 +02:00
Joas Schilling
529e4c00fb [ticket/11495] Move lock code into two methods to allow easier handling 
This also allows to simply remove the lock handling by overwriting the two
methods acquire_lock() and release_lock().

PHPBB3-11495
 2013-04-30 15:15:50 +02:00
Joas Schilling
202484ebb4 [ticket/11495] Fix docs of add_item_to_nestedset() and take id as argument 
PHPBB3-11495
 2013-04-30 14:45:22 +02:00
Joas Schilling
863d0c7687 [ticket/11495] Fix some more comments and the package tag 
PHPBB3-11495
 2013-04-30 14:36:26 +02:00
Joas Schilling
87e8e60d3c [ticket/11495] Correctly distinguish between children and descendants 
PHPBB3-11495
 2013-04-30 14:12:45 +02:00
Joas Schilling
67f2edae17 [ticket/11495] Use descendants and ancestors instead of parents/children 
PHPBB3-11495
 2013-04-30 13:58:03 +02:00
Joas Schilling
4810c61fd7 [ticket/11495] Remove get_parent_data from interface and rename it 
The method is implementation specific and has no use, apart from cache, that is
not covered by get_path_data().

PHPBB3-11495
 2013-04-30 10:37:59 +02:00