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

16511 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Oleg Pudeyev
ba01996e5a Merge PR #1389 branch 'EXreaction/ticket/11519' into develop 
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11519:
  [ticket/11519] Rename test event template file
 2013-05-06 15:12:44 -04:00
Matt Friedman
153be855ca [ticket/10155] Update copyright in new migration file to 2013 
PHPBB3-10155
 2013-05-06 09:49:37 -07:00
Nathaniel Guse
9608d9bf1e [ticket/11519] Rename test event template file 
As requested by Oleg
https://github.com/phpbb/phpbb3/pull/1340#issuecomment-17306967

PHPBB3-11519
 2013-05-04 11:45:49 -05: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
3a30bd2753 [ticket/11288] add search tests cases 
PHPBB3-11288
 2013-05-04 18:25:43 +05:30
Dhruv
00d5cde04e [ticket/10325] fix acp language 
PHPBB3-10325
 2013-05-04 14:44:33 +05:30
Nathaniel Guse
1b34ddb330 [ticket/11415] Fix ext.manager constructor in tests 
PHPBB3-11415
 2013-05-03 09:10:54 -05:00
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
Andreas Fischer
92e0613324 Merge remote-tracking branch 'hjpotter92/ticket/11517' into develop-olympus 
* hjpotter92/ticket/11517:
  [ticket/11517] Fix list numbering
 2013-05-02 23:12:39 +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
Nathaniel Guse
87b01fc854 [ticket/11415] Make migrator/ext.manager dependencies of the base ext class 
PHPBB3-11415
 2013-05-01 15:18:53 -05:00
Nathaniel Guse
60e3272839 [ticket/11415] Remove migrator dependency from extension manager 
PHPBB3-11415
 2013-05-01 14:09:08 -05:00
Nathaniel Guse
7ed21cc6f2 [ticket/11415] Move migrator to base extension class from ext.manager 
PHPBB3-11415
 2013-05-01 14:02:13 -05:00
Oleg Pudeyev
954edb3eb4 Merge PR #1372 branch 'EXreaction/ticket/11435' into develop 
# By Nathan Guse (2) and Nathaniel Guse (1)
# Via Nathaniel Guse
* EXreaction/ticket/11435:
  [ticket/11435] Mark extension spacing test as incomplete
  [ticket/11435] Create test to make sure template/event output is equal
  [ticket/11435] Fix comments in events test
 2013-05-01 14:16:41 -04:00
Nathaniel Guse
9db4e856db [ticket/11415] Move while loop from ext manager to acp_extensions.php 
Now enable_step works as it's supposed to (do one step at a time) and
less refreshes are required for the user.

PHPBB3-11415
 2013-05-01 13:00:43 -05:00
Nathaniel Guse
356bc00a29 [ticket/11435] Mark extension spacing test as incomplete 
This test fails until 11435 is fixed

Add newlines at EOF

PHPBB3-11435
 2013-04-30 23:21:50 -05: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
1d0c8a1fe8 [ticket/10325] use assert_response_success parts 
PHPBB3-10325
 2013-04-30 23:09:28 +05:30
Dhruv
a90a0b087c [ticket/10325] fix language in acp and ucp 
PHPBB3-10325
 2013-04-30 22:59:32 +05:30
Dhruv
a5b5e4b31d [ticket/10325] add assert_response_success in test 
PHPBB3-10325
 2013-04-30 22:29:20 +05:30
Joas Schilling
6a7378ecbd [ticket/11495] Some more doc changes 
PHPBB3-11495
 2013-04-30 18:39:22 +02:00
Joas Schilling
d1d59dc5cc [ticket/11495] Remove unneccessary values from tests 
PHPBB3-11495
 2013-04-30 18:33:28 +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
fe02218a2d [ticket/11495] Remove forum_parents from tests where it is not required 
PHPBB3-11495
 2013-04-30 18:11:24 +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
39ff3ed15f [ticket/11495] Add proper testing of item_parent to tests 
PHPBB3-11495
 2013-04-30 18:05:44 +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
Joas Schilling
8a4260703f [ticket/11495] Fix some docs and replace branch with other terms 
PHPBB3-11495
 2013-04-30 10:32:01 +02:00
Vjacheslav Trushkin
947550df8f [ticket/10741] Docblock for phpbb.resizeTextArea 
Better description of phpBB.resizeTextArea with detailed
explanation of all optional parameters.

Removed unnecessary semicolons

PHPBB3-10741
 2013-04-30 11:27:43 +03:00