mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 12:34:59 +02:00
Code Issues Releases Wiki Activity
14,013 Commits 18 Branches 192 Tags
Commit Graph

6040 Commits

Author SHA1 Message Date
Igor Wiedler
e103b2f0cc [feature/dic] Fix parse errors 
PHPBB3-10739
 2012-08-25 17:04:42 +02:00
Igor Wiedler
ae85d43757 Merge remote-tracking branch 'upstream/develop' into feature/dic 
* upstream/develop: (259 commits)
  [prep-release-3.0.11] Bumping version number for 3.0.11 final.
  [feature/php-events] Fix doc of core.viewonline_overwrite_location
  [feature/php-events] Fix doc of core.user_set_default_group
  [feature/php-events] Fix doc of core.generate_smilies_after
  [feature/php-events] Fix doc of core.delete_user_after
  [feature/php-events] Fix doc of core.delete_user_before
  [feature/php-events] Fix doc of core.update_username
  [feature/php-events] Fix doc of core.memberlist_prepare_profile_data
  [feature/php-events] Fix doc and position of viewonline_overwrite_location
  [feature/php-events] Fix doc of core.viewtopic_get_post_data
  [feature/php-events] Fix doc of core.viewtopic_cache_guest_data
  [ticket/11061] Add the --dev flag to the composer instructions in README
  [ticket/11060] Make sure pyrus can install everything on travis
  [ticket/11059] Use https for the README logo
  [feature/php-events] Fix acp_manage_forums_update_data_before and is_new_forum
  [feature/php-events] Fix core.acp_manage_forums_update_data_after vars
  [ticket/11032] fix language of error displayed
  [ticket/11052] update search backend constructor everywhere
  [ticket/11052] pass parametes to search construct while posting
  [ticket/11054] Fixed $config var description
  ...

Conflicts:
	phpBB/includes/cron/task/core/tidy_cache.php
	phpBB/includes/cron/task/core/tidy_search.php
 2012-08-25 17:00:40 +02:00
Igor Wiedler
fd9fd71a88 [feature/dic] Add docblock for cron_manager::wrap_task() 
PHPBB3-10739
 2012-08-25 16:54:30 +02:00
Igor Wiedler
4f0f63ae8f [feature/dic] Make cron task attributes protected, one per line 
PHPBB3-10739
 2012-08-25 16:51:19 +02:00
Igor Wiedler
4feb9aa8d7 [feature/dic] Coding style: Braces 
PHPBB3-10739
 2012-08-25 16:43:41 +02:00
David King
310c906932 Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop 2012-08-20 09:09:53 -04:00
Joas Schilling
365d95c1fe [feature/php-events] Fix doc of core.user_set_default_group 
PHPBB3-9550
 2012-08-20 10:11:52 +02:00
Joas Schilling
01db8144d4 [feature/php-events] Fix doc of core.generate_smilies_after 
PHPBB3-9550
 2012-08-20 10:10:52 +02:00
Joas Schilling
48b54ed1e0 [feature/php-events] Fix doc of core.delete_user_after 
PHPBB3-9550
 2012-08-20 10:09:29 +02:00
Joas Schilling
74d9ef0bec [feature/php-events] Fix doc of core.delete_user_before 
PHPBB3-9550
 2012-08-20 10:08:59 +02:00
Joas Schilling
aea60f9323 [feature/php-events] Fix doc of core.update_username 
PHPBB3-9550
 2012-08-20 10:08:28 +02:00
Oleg Pudeyev
89d334ee6a Merge PR #954 branch 'dhruvgoel92/ticket/11032' into develop 
* dhruvgoel92/ticket/11032:
  [ticket/11032] fix language of error displayed
 2012-08-18 22:26:58 -04:00
Joas Schilling
90ed6e734d [feature/php-events] Fix acp_manage_forums_update_data_before and is_new_forum 
PHPBB3-9550
 2012-08-18 20:32:58 +02:00
Joas Schilling
b32d5a3edf [feature/php-events] Fix core.acp_manage_forums_update_data_after vars 
PHPBB3-9550
 2012-08-18 20:25:11 +02:00
Dhruv
d4f1e71d5e [ticket/11032] fix language of error displayed 
Language of the error displayed is modified.

PHPBB3-11032
 2012-08-15 22:57:02 +05:30
David King
d07cb6d778 Merge remote-tracking branch 'dhruvgoel92/ticket/11052' into develop 2012-08-15 12:40:08 -04:00
Dhruv
7c406e1e81 [ticket/11052] update search backend constructor everywhere 
PHPBB3-11052
 2012-08-15 22:05:26 +05:30
David King
485710e016 Merge remote-tracking branch 'dhruvgoel92/ticket/11052' into develop 2012-08-15 12:32:34 -04:00
Dhruv
938805106c [ticket/11052] pass parametes to search construct while posting 
Proper parameters are passed in search backend constructor in
functions_posting.php

PHPBB3-11052
 2012-08-15 21:09:42 +05:30
David King
b729609fb2 [ticket/11054] Fixed $config var description 
PHPBB3-11054
 2012-08-15 09:15:18 -04:00
David King
0b70c3d0d6 [ticket/11054] The user class is phpbb_user 
PHPBB3-11054
 2012-08-14 10:02:16 -04:00
David King
fe579cac83 [ticket/11054] Fixed documentation syntax for @var in extension/controller.php 
PHPBB3-11054
 2012-08-14 09:57:17 -04:00
Andreas Fischer
64ff06cf87 Merge remote-tracking branch 'dhruvgoel92/ticket/11048' into develop 
* dhruvgoel92/ticket/11048:
  [ticket/11048] use protected instead of private in pgsql fulltext
  [ticket/11048] use protected instead of private in native search
  [ticket/11048] remove @access from all docblocks
  [ticket/11048] use protected instead of private in mysql fulltext
  [ticket/11048] use protected instead of private in sphinx
  [ticket/11048] add access specifiers to phpbb native search properties
  [ticket/11048] add access specifiers to sphinx search
  [ticket/11048] add access specifiers to phpbb native search
  [ticket/11048] add access specifiers to mysql search
  [ticket/11048] add access specifiers to pgsql search
 2012-08-14 14:38:19 +02:00
Dhruv
a9fd98c136 [ticket/11048] use protected instead of private in pgsql fulltext 
PHPBB3-11048
 2012-08-14 17:47:01 +05:30
Dhruv
469d808365 [ticket/11048] use protected instead of private in native search 
PHPBB3-11048
 2012-08-14 17:46:17 +05:30
Dhruv
8e8e94ec4c [ticket/11048] remove @access from all docblocks 
PHPBB3-11048
 2012-08-14 17:43:01 +05:30
Dhruv
5698d03ead [ticket/11048] use protected instead of private in mysql fulltext 
PHPBB3-11048
 2012-08-14 17:35:24 +05:30
Dhruv
d0cdf445fb [ticket/11048] use protected instead of private in sphinx 
PHPBB3-11048
 2012-08-14 17:33:44 +05:30
Nils Adermann
dca9057559 Merge pull request #932 from EXreaction/ticket/10875 
Ticket/10875
 2012-08-14 02:30:49 -07:00
Dhruv
17b8719144 [ticket/11032] sphinx retries before triggering error 
Sphinx connection retries should be done before error is triggered.

PHPBB3-11032
 2012-08-11 01:06:07 +05:30
Dhruv
a3a359d80a [ticket/11048] add access specifiers to phpbb native search properties 
PHPBB3-11048
 2012-08-10 16:35:06 +05:30
Dhruv
42d6e0715f [ticket/11048] add access specifiers to sphinx search 
PHPBB3-11048
 2012-08-10 14:06:25 +05:30
Dhruv
dd56c401af [ticket/11048] add access specifiers to phpbb native search 
PHPBB3-11048
 2012-08-10 12:23:25 +05:30
Dhruv
de8b7c0b7d [ticket/11048] add access specifiers to mysql search 
PHPBB3-11048
 2012-08-10 11:35:50 +05:30
Dhruv
b2e166dbfa [ticket/11048] add access specifiers to pgsql search 
PHPBB3-11048
 2012-08-10 11:30:02 +05:30
Dhruv
698b7999c4 [ticket/11032] trigger error in case search fails 
Admins are shown actual error while users are shown a search failed error
in case sphinx search fails.

PHPBB3-11032
 2012-08-10 10:46:32 +05:30
Joas Schilling
cdcadf72c4 [feature/php-events] Add event core.acp_manage_forums_move_content 
PHPBB3-9550
 2012-08-08 13:22:21 +02:00
Joas Schilling
43d17b2337 [feature/php-events] Fix doc and naming of core.acp_manage_forums_move_children 
PHPBB3-9550
 2012-08-08 13:22:20 +02:00
Joas Schilling
70c90bea4f [feature/php-events] Fix doc and naming of acp_manage_forums_update_data_after 
PHPBB3-9550
 2012-08-08 13:22:20 +02:00
Joas Schilling
cfd5fcbe26 [feature/php-events] Add new event core.acp_manage_forums_update_data_before 
Allows you to remove data from forum_data_sql before we update/create the forum

PHPBB3-9550
 2012-08-08 13:01:39 +02:00
Joas Schilling
caf76b4ceb [feature/php-events] Fix naming and doc of core.acp_manage_forums_validate_data 
PHPBB3-9550
 2012-08-08 12:50:47 +02:00
Joas Schilling
3beda0cbab [feature/php-events] Fix naming and doc of core.acp_manage_forums_display_form 
PHPBB3-9550
 2012-08-08 12:44:28 +02:00
Joas Schilling
38ba09e707 [feature/php-events] Fix naming and doc of acp_manage_forums_initialise_data 
PHPBB3-9550
 2012-08-08 12:38:23 +02:00
Joas Schilling
e3a9bf0376 [feature/php-events] Fix doc and naming of core.acp_forums_request_forum_data 
PHPBB3-9550
 2012-08-08 12:35:26 +02:00
Oleg Pudeyev
7c6e1ba109 Merge PR #916 branch 'dhruvgoel92/ticket/11011' into develop 
* dhruvgoel92/ticket/11011:
  [ticket/11011] rename property phpEx to php_ext
  [ticket/11011] pass $auth to search backend constructor
  [ticket/11011] remove global keyword from sphinx
  [ticket/11011] pass global variables in construct
  [ticket/11011] passing global variables
  [ticket/11011] remove global keyword in native search
  [ticket/11011] remove global keyword in pgsql search
  [ticket/11011] global variables as constructor parameters
  [ticket/11011] add access specifiers and docblocks
 2012-08-08 03:19:00 -04:00
Dhruv
a422ddfe31 [ticket/11011] rename property phpEx to php_ext 
PHPBB3-11011
 2012-08-08 11:16:46 +05:30
Dhruv
794d6ec443 [ticket/11011] pass $auth to search backend constructor 
$auth global var is passed to search backend constructor, as it is used
by sphinx backend.

PHPBB3-11011
 2012-08-08 11:07:47 +05:30
Oleg Pudeyev
ce32a31b60 Merge PR #933 branch 'dhruvgoel92/ticket/11032' into develop 
* dhruvgoel92/ticket/11032:
  [ticket/11032] use method GetLastError to get error
  [ticket/11032] add sphinx errors to error log
 2012-08-08 01:18:10 -04:00
Andreas Fischer
bb40b558f1 Merge remote-tracking branch 'Noxwizard/ticket/11043' into develop 
* Noxwizard/ticket/11043:
  [ticket/11043] Change hook name back to display, since that's where we hook in.
  [ticket/11043] Allow call_hook() to be called from more than one location.
  [ticket/11043] Update template hook name
 2012-08-07 22:27:30 +02:00
Andreas Fischer
095d7d97a3 Merge remote-tracking branch 'Fyorl/ticket/11044' into develop 
* Fyorl/ticket/11044:
  [ticket/11044] Added comment explaining filename splitting
  [ticket/11044] Preserve the file extension in unique filenames
  [ticket/11044] Minor adjustments as per PR comments
  [ticket/11044] Compress class now deals with file conflicts
 2012-08-06 23:32:28 +02:00