makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-21 17:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
24981 commits 18 branches 192 tags 208 MiB
Commit graph

24981 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fyorl
6aea4db6c7 [ticket/10944] Reverted changes in PHPBB3-10963 
is_image now just checks the mimetype reported by the browser
and get_mimetype goes back to being unused.

PHPBB3-10944
 2012-07-17 17:39:00 +01:00
Andreas Fischer
6980b3dcfd Merge remote-tracking branch 'nickvergessen/ticket/10942' into develop 
* nickvergessen/ticket/10942:
  [ticket/10942] Avoid possible conflicts with magic words in unit tests
  [ticket/10942] Add access modifiers
  [ticket/10942] Use ANSI SQL standard || in dbal.php
  [ticket/10942] Fix up unit tests for sql_case()
  [ticket/10942] Require same data type and do not cast expressions automatically
  [ticket/10942] Make unit tests for sql_case simpler
  [ticket/10942] Add a comment why we cast to sql_case()
  [ticket/10942] Rename method sql_conditional() to sql_case()
  [ticket/10942] Change term string to expression to avoid confusion
  [ticket/10942] Fix sql_conditional for mssql, postgre and oracle
  [ticket/10942] Fix function name on order_lower_test.php
  [ticket/10942] Add unit tests for sql_concatenate
  [ticket/10942] Add sql_concatenate to dbal
  [ticket/10942] Add unit tests for sql_conditional
  [ticket/10942] Add sql_conditional to dbal
 2012-07-17 17:59:56 +02:00
Joas Schilling
3637cd395e [feature/new-tz-handling] Properly name new timezone selection function 
Marked the old one as deprecated and made it using the new function.

PHPBB3-9558
 2012-07-17 16:09:05 +02:00
Andreas Fischer
cb9a25ca80 [ticket/10993] Use composer.phar from our repository in README.md 
PHPBB3-10993
 2012-07-17 02:28:04 +02:00
Fyorl
d88411e10d [ticket/10981] Modified functional framework to account for goutte changes 
PHPBB3-10981
 2012-07-16 17:52:03 +01:00
Fyorl
797ee16eaf [ticket/10981] Added goutte via composer 
composer.phar added and autoloaded before tests

PHPBB3-10981
 2012-07-16 17:52:03 +01:00
Joas Schilling
48d3c68290 [feature/new-tz-handling] Use tmp variable for user timezone 
PHPBB3-9558
 2012-07-16 18:44:13 +02:00
Joas Schilling
b61ac43abe [feature/new-tz-handling] Allow phpbb prefix for user data validation functions 
PHPBB3-9558
 2012-07-16 18:41:30 +02:00
Joas Schilling
f5bb145040 [feature/new-tz-handling] Require user argument on phpbb_datetime 
PHPBB3-9558
 2012-07-16 18:29:31 +02:00
Fyorl
fa4eaeb306 [ticket/10992] Changed octetstream to octet-stream 
PHPBB3-10992
 2012-07-16 18:24:45 +02:00
Fyorl
e9a1189bfc [ticket/10992] test_empty_file() now tries to upload the correct file 
PHPBB3-10992
 2012-07-16 18:24:35 +02:00
Fyorl
91050356d3 [ticket/10992] Modified upload tests to work with new version 
PHPBB3-10992
 2012-07-16 18:24:16 +02:00
Joas Schilling
d9a32ce614 [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user 
PHPBB3-10950
 2012-07-16 17:22:10 +02:00
Joas Schilling
1b826842aa [ticket/10942] Avoid possible conflicts with magic words in unit tests 
PHPBB3-10942
 2012-07-16 16:59:40 +02:00
Nathan
97350944e3 [ticket/7598] Use $user->lang['COMMA_SEPARATOR'] 
PHPBB3-7598
 2012-07-14 17:40:37 -05:00
Nathan
f3e6547acf [ticket/7598] Inactive users action notification (ACP) 
When performing an action on users in the ACP Inactive Users, such as activating, deleting, or reminding, trigger_error is now called to give a notification that the action was performed

PHPBB3-7598
 2012-07-13 22:18:28 -05:00
David King
d908d93273 [ticket/10444] Do not default to the previous post edit reason. 
PHPBB3-10444
 2012-07-12 16:02:58 -04:00
Andreas Fischer
b45bc27339 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
 2012-07-12 18:19:58 +02:00
Andreas Fischer
8f5182bf84 Merge branch 'prep-release-3.0.11' into develop-olympus 
* prep-release-3.0.11:
  [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
 2012-07-12 18:19:40 +02:00
Andreas Fischer
35e18a49a9 Merge remote-tracking branch 'Noxwizard/ticket/10978' into prep-release-3.0.11 
* Noxwizard/ticket/10978:
  [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
 2012-07-12 18:19:19 +02:00
Dhruv Goel
d2e42d7d61 [feature/sphinx-fulltext-search] remove unnecessary code 
Some extra conditions and variables used in autoconf are removed.

PHPBB3-10946
 2012-07-12 17:32:09 +05:30
Dhruv Goel
569db1471b [feature/sphinx-fulltext-search] fix stopwords option 
Stopwords option can be configured in ACP to generate correct sphinx
config file.

PHPBB3-10946
 2012-07-12 17:32:08 +05:30
Dhruv Goel
88089194e5 [feature/sphinx-fulltext-search] prefix sphinx with constant names 
All constant names are prefixed with SPHINX_

PHPBB3-10946
 2012-07-12 17:32:07 +05:30
Dhruv Goel
e486f4389c [feature/sphinx-fulltext-search] remove autoconf 
Remove all code related to sphinx automatic configuration and all exec
calls.

PHPBB3-10946
 2012-07-12 17:32:06 +05:30
Dhruv Goel
8dcdf8a973 [feature/sphinx-fulltext-search] add docblock and access modifiers 
PHPBB3-10946

Conflicts:

	phpBB/includes/search/fulltext_sphinx.php
 2012-07-12 17:32:05 +05:30
Dhruv Goel
2503581cd5 [feature/sphinx-fulltext-search] add class properties indexes & sphinx 
PHPBB3-10946
 2012-07-12 17:32:04 +05:30
Dhruv Goel
0e9174d168 [feature/sphinx-fulltext-search] use keywords_search instead of get_name 
using keyword_search method instead of get_name to distinguish between the
search backend classes present in includes/search and other helper classes.

PHPBB3-10946
 2012-07-12 17:32:03 +05:30
Dhruv Goel
06eeed058d [feature/sphinx-fulltext-search] remove unused arrays 
PHPBB3-10946
 2012-07-12 17:32:02 +05:30
Dhruv Goel
4a11a7b970 [feature/sphinx-fulltext-search] add sphinx_table constant to constants.php 
PHPBB3-10946
 2012-07-12 17:32:01 +05:30
Dhruv Goel
97fda78e7d [feature/sphinx-fulltext-search] Make different files for different classes 
Break the classes in functions-sphinx.php into different files
with proper class names according to phpbb class auto loader conventions.

PHPBB3-10946

Conflicts:

	phpBB/includes/search/sphinx/config.php
 2012-07-12 17:32:00 +05:30
Dhruv Goel
10b706674e [feature/sphinx-fulltext-search] add binlog_path to config 
binlog files are now added to the data folder.

PHPBB3-10946
 2012-07-12 17:31:58 +05:30
Dhruv Goel
39f8a5fa9f [feature/sphinx-fulltext-search] use sql_build_query for query 
Uses sql_build_query for JOIN query. Remove casting to int and space for
phpbb conventions to be followed

PHPBB3-10946

Conflicts:

	phpBB/includes/search/fulltext_sphinx.php
 2012-07-12 17:31:57 +05:30
Dhruv Goel
bfd01f0187 [feature/sphinx-fulltext-search] remove all reference returns 
PHPBB3-10946
 2012-07-12 17:31:56 +05:30
Dhruv Goel
f609555b1a [feature/sphinx-fulltext-search] integrate sphinx language keys with core 
Language keys removed from mods folder and added to
language/en/acp/search.php

PHPBB3-10946
 2012-07-12 17:31:49 +05:30
Dhruv Goel
74a7407927 [feature/sphinx-fulltext-search] improve classes in functions-sphinx.php 
PHPBB3-10946
 2012-07-12 17:27:29 +05:30
Dhruv Goel
02588069f0 [feature/sphinx-fulltext-search] fix config variables 
config variables now use class property for unique id

PHPBB3-10946

Conflicts:

	phpBB/includes/search/fulltext_sphinx.php
 2012-07-12 17:27:28 +05:30
Dhruv Goel
455a35d836 [feature/sphinx-fulltext-search] temporary commit to pull out sphinx-api 
also need to add the latest sphinx api instead of this.

PHPBB3-10946
 2012-07-12 17:27:27 +05:30
Dhruv Goel
a3b2caf841 [feature/sphinx-fulltext-search] include sample sphinx.conf in docs 
PHPBB3-10946
 2012-07-12 17:27:26 +05:30
Dhruv Goel
8d76bc45ee [feature/sphinx-fulltext-search] minor fixes in formatting 
Add a newline at the end of files. Update License information in package
docbloc.

PHPBB3-10946
 2012-07-12 17:27:25 +05:30
Dhruv Goel
99d4660df6 [feature/sphinx-fulltext-search] update config file 
Sphinx config file updated according to new documentation.

PHPBB3-10946
 2012-07-12 17:27:24 +05:30
Dhruv Goel
fcf0d04b20 [feature/sphinx-fulltext-search] minor changes 
some minor code changes to make it working against current develop
and comply with other search backend coding convetions.

PHPBB3-10946
 2012-07-12 17:27:23 +05:30
Dhruv Goel
a50b0faf4a [feature/sphinx-fulltext-search] MOD by naderman installed in phpbb 
PHPBB3-10946
 2012-07-12 17:27:22 +05:30
Joas Schilling
c4c95fddaa [ticket/10982] Correctly check, whether data-overlay is set 
PHPBB3-10982
 2012-07-11 15:06:44 +02:00
Joas Schilling
4aabe0cd4d [ticket/10982] Remove overlay on first up/down move of forums in ACP 
PHPBB3-10982
 2012-07-11 14:54:31 +02:00
Joas Schilling
95298de5ae [ticket/10982] Allow setting dimming control overlay also as data-overlay 
PHPBB3-10982
 2012-07-11 14:53:50 +02:00
Joas Schilling
d883535b10 [ticket/10950] Remove deleted entries in tests instead of commenting them out 
PHPBB3-10950
 2012-07-11 13:05:36 +02:00
Joas Schilling
e68c1fb9e4 [ticket/10950] Use database count() and group by instead of doing that in php 
PHPBB3-10950
 2012-07-11 12:58:57 +02:00
Nathan
b25efd744d [ticket/8323] Only disable administrative deactivated accounts from receiving PMs 
Allow other types of inactive accounts to receive PMs. Remove the banned PM error message and use the string saying they do not have permission (less translation)

PHPBB3-8323
 2012-07-10 17:41:27 -05:00
Nathan
08bdebb0b5 [ticket/8323] Allow temporarily banned users to receive PMs, but not a notification 
PHPBB3-8323
 2012-07-10 16:38:07 -05:00
Nathan
33852e6251 [ticket/8323] Correct PM notification settings (only notify those who can receive them) 
Also correcting the way it was setup for users to be able to receive PMs (do not allow administrators/moderators to send to banned, inactive, or non-standard users, that just doesn't make sense)

PHPBB3-8323
 2012-07-10 16:07:12 -05:00