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
23471 commits 18 branches 192 tags 207 MiB
Commit graph

9151 commits

Author SHA1 Message Date
Oleg Pudeyev
b1378f20af [feature/postgresql-fulltext-search] Remove closing php tag 
PHPBB3-9730
 2012-07-05 21:09:54 +05:30
Oleg Pudeyev
d9fd0cce0a Merge PR #759 branch 'nickvergessen/ticket/10811' into develop 
* nickvergessen/ticket/10811:
  [ticket/10811] Make toogle_subscribe more generic so it can toogle all links
  [ticket/10811] Make it easier for MODs/Extensions to define the alt-text
  [ticket/10811] Make subscribe/unsubscribe repeatable with AJAX
  [ticket/10811] Fix AJAX callback alt_text so it can be repeated.
 2012-07-05 10:44:48 -04:00
Andreas Fischer
c54d74ec0e Merge remote-tracking branch 'Fyorl/ticket/10963' into develop 
* Fyorl/ticket/10963:
  [ticket/10963] filespec::get_mimetype now used
  [ticket/10963] Removed superfluous ternary statement and strpos now stricter
  [ticket/10963] Modified filespec::is_image() to check actual mimetype
 2012-07-05 02:00:31 +02:00
Joas Schilling
f1056a9b2f [ticket/10811] Make toogle_subscribe more generic so it can toogle all links 
PHPBB3-10811
 2012-07-05 01:03:19 +02:00
Fyorl
4fbcf4eaad [ticket/10963] filespec::get_mimetype now used 
filespec::get_mimetype now uses the finfo class in order to detect the
mimetype of a given filename. filespec::is_image() now uses this method.

PHPBB3-10963
 2012-07-04 13:27:55 +01:00
Joas Schilling
6776feb0de [ticket/10942] Add access modifiers 
PHPBB3-10942
 2012-07-04 14:05:03 +02:00
Joas Schilling
338d29072f [ticket/10950] Check $delete_ids to be not empty 
PHPBB3-10950
 2012-07-04 13:14:19 +02:00
Joas Schilling
5c8c7b1352 [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms() 
- Get delete_ids, pms of the user as receipt
- Get undelivered_msg, pms of the user as sender
- Delete undelivered_msg, if there are only NO_BOX, OUTBOX and SENTBOX links
- Correct the _new and _unread user values for the receipts
- Delete delete_ids, if there are no links to them anymore
- Reset _new and _unread values for the user we delete

PHPBB3-10950
 2012-07-04 13:10:15 +02:00
Andreas Fischer
2c12f31cdf [ticket/10937] Update documentation to say which comment styles are removed. 
PHPBB3-10937
 2012-07-03 01:02:42 +02:00
Andreas Fischer
81d5327e44 [ticket/10937] Comment removal functions: Restore backward compatibility 
PHPBB3-10937
 2012-07-03 01:02:42 +02:00
Fyorl
f208b59c59 [ticket/10963] Removed superfluous ternary statement and strpos now stricter 
PHPBB3-10963
 2012-07-02 23:49:40 +01:00
Fyorl
03ddfbbaf1 [ticket/10963] Modified filespec::is_image() to check actual mimetype 
Modified filespec::is_image() to check the Fileinfo mimetype rather than
trusting the browser.

PHPBB3-10963
 2012-07-02 23:30:47 +01:00
Joas Schilling
fe1f21d1a5 [ticket/10942] Use ANSI SQL standard || in dbal.php 
PHPBB3-10942
 2012-07-02 23:11:21 +02:00
Joas Schilling
a8cf926566 [ticket/10942] Require same data type and do not cast expressions automatically 
PHPBB3-10942
 2012-07-02 11:10:02 +02:00
Igor Wiedler
df16bd1c49 [feature/avatars] Rewrite drivers to use full class name 
* Use full driver class name as avatar_type value
* Move avatar drivers to core namespace
* Make avatars installable through extensions

PHPBB3-10018
 2012-06-27 21:02:07 +02:00
Igor Wiedler
d104866992 [feature/avatars] Remove unneeded argument for driver prepare_form() 
PHPBB3-10018
 2012-06-27 16:59:38 +02:00
Igor Wiedler
6d994380d7 [feature/avatars] Fix error in avatar_manager::clean_row 
PHPBB3-10018
 2012-06-27 14:48:51 +02:00
Igor Wiedler
1b3cb68c2f Merge remote-tracking branch 'upstream/develop' into feature/avatars 
* upstream/develop: (255 commits)
  [ticket/10935] Limit number of PM rules per user to 5000
  [ticket/10801] Fixed quickmod tools.
  [ticket/9551] uncomment line and change length to 255
  [ticket/10925] Clarify installation requirements for SQLite
  [ticket/10938] Serve subforum listing on forumlist from template loop
  [ticket/10640] Change subject length in mcp in subsilver
  [ticket/10640] Change subject length in MCP
  [ticket/10640] Do not change default value of truncate_string()
  [ticket/10640] Change maximum subject length
  [ticket/10936] remove PCRE and mbstring support check
  [ticket/10936] fix language key
  [ticket/10829] Delete T_STYLESHEET_NAME - no longer used.
  [ticket/10829] $style_name -> $style_path in style class.
  [ticket/10743] Renaming user->theme
  [ticket/10743] Changing obtain_cfg_items
  [ticket/10882] Fix test name - oops.
  [ticket/10931] Apply strtolower() correctly, i.e. not on false.
  [ticket/10931] Also test get_bytes() and get_string() with false.
  [ticket/10931] Make to_numeric function globally available.
  [ticket/10932] Use included composer.phar in build process
  ...

Conflicts:
	phpBB/includes/mcp/mcp_warn.php
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_avatar_options.html
 2012-06-27 14:47:13 +02:00
Andreas Fischer
49afc1f2dc [ticket/10950] Correct comment for the second query. 
Only undelivered messages are handled.

PHPBB3-10950
 2012-06-23 11:16:38 +02:00
Andreas Fischer
30475856c4 [ticket/10950] Add empty line to make unset() call more visible. 
PHPBB3-10950
 2012-06-23 10:47:26 +02:00
Andreas Fischer
fce385e5bc [ticket/10950] Select the correct columns in SQL queries. 
PHPBB3-10950
 2012-06-23 10:45:36 +02:00
Andreas Fischer
9c2930178f [ticket/10950] Use a variable for the private message id. 
PHPBB3-10950
 2012-06-23 10:43:43 +02:00
Andreas Fischer
a50d1a3576 [ticket/10950] Move array initialisation to the front. 
PHPBB3-10950
 2012-06-23 10:32:16 +02:00
Andreas Fischer
2a76b7e869 [ticket/10950] Remove redundant if statement. 
We already know author_id and folder_id.

PHPBB3-10950
 2012-06-23 10:30:09 +02:00
Andreas Fischer
35b18676cd [ticket/10950] Fix SQL coding style (indentation) in second SQL query. 
PHPBB3-10950
 2012-06-23 10:28:13 +02:00
Andreas Fischer
ac8ebfabc7 [ticket/10950] Use proper ' in order to fix comment. 
PHPBB3-10950
 2012-06-23 10:26:48 +02:00
Andreas Fischer
85ea062a05 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10935] Limit number of PM rules per user to 5000
 2012-06-21 10:31:08 +02:00
Andreas Fischer
80180a6a20 Merge branch 'prep-release-3.0.11' into develop-olympus 
* prep-release-3.0.11:
  [ticket/10935] Limit number of PM rules per user to 5000
 2012-06-21 10:30:56 +02:00
Joas Schilling
c71f604327 [ticket/10942] Add a comment why we cast to sql_case() 
PHPBB3-10942
 2012-06-20 23:30:31 +02:00
Joas Schilling
82e195ac68 [feature/new-tz-handling] Fix code and doc layout 
PHPBB3-9558
 2012-06-20 14:34:35 +02:00
Joas Schilling
80fafdeb1a [ticket/10935] Limit number of PM rules per user to 5000 
PHPBB3-10935
 2012-06-20 14:29:48 +02:00
Joas Schilling
089e5f5c79 [ticket/10942] Rename method sql_conditional() to sql_case() 
PHPBB3-10942
 2012-06-20 12:57:08 +02:00
Joas Schilling
79dfdf9406 [ticket/10942] Change term string to expression to avoid confusion 
PHPBB3-10942
 2012-06-20 12:50:12 +02:00
Joas Schilling
c8e322d88f [ticket/10942] Fix sql_conditional for mssql, postgre and oracle 
PHPBB3-10942
 2012-06-20 12:41:26 +02:00
Joas Schilling
1e3272bfce [ticket/10942] Add sql_concatenate to dbal 
PHPBB3-10942
 2012-06-20 02:10:04 +02:00
Oleg Pudeyev
820ad818dd Merge PR #844 branch 'dhruvgoel92/ticket/10936' into develop 
* dhruvgoel92/ticket/10936:
  [ticket/10936] remove PCRE and mbstring support check
  [ticket/10936] fix language key
 2012-06-19 19:51:39 -04:00
Joas Schilling
71374078b9 [ticket/10942] Add sql_conditional to dbal 
PHPBB3-10942
 2012-06-20 01:50:00 +02:00
Joas Schilling
a5628cbdc8 [feature/new-tz-handling] Fix docs in phpbb_user class 
PHPBB3-9558
 2012-06-20 00:29:31 +02:00
Nils Adermann
419d6cd035 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9551] uncomment line and change length to 255
 2012-06-19 20:09:31 +02:00
Nils Adermann
08763ac99e Merge remote-tracking branch 'github-dhruvgoel92/ticket/9551' into develop-olympus 
* github-dhruvgoel92/ticket/9551:
  [ticket/9551] uncomment line and change length to 255
 2012-06-19 20:09:23 +02:00
Joas Schilling
c7d32a1b2d [feature/new-tz-handling] Prefix function with phpbb_ 
PHPBB3-9558
 2012-06-19 19:26:57 +02:00
Joas Schilling
a613caab09 [feature/new-tz-handling] Trim comment length and remove leading underscores 
PHPBB3-9558
 2012-06-19 19:24:03 +02:00
Joas Schilling
217d9280dd [feature/new-tz-handling] Fix comment and validation in ACP board module 
PHPBB3-9558
 2012-06-19 19:21:59 +02:00
Dhruv Goel
bbd3204a9c [ticket/9551] uncomment line and change length to 255 
incase of partial collation change post_subject field will be changed back
to the default collation and length 255.

PHPBB3-9551
 2012-06-19 20:03:57 +05:30
Oleg Pudeyev
e7da931d3a Merge PR #571 branch 'unknownbliss/ticket/10640' into develop 
* unknownbliss/ticket/10640:
  [ticket/10640] Change subject length in mcp in subsilver
  [ticket/10640] Change subject length in MCP
  [ticket/10640] Do not change default value of truncate_string()
  [ticket/10640] Change maximum subject length
 2012-06-18 20:55:01 -04:00
Joas Schilling
3e3489195f [feature/new-tz-handling] Add a function to get the timestamp of a date 
The function uses the given timezone and returns the correct UNIX timestamp of it.

PHPBB3-9558
 2012-06-18 15:11:07 +02:00
Joas Schilling
1716e2a2a5 [feature/new-tz-handling] Update doc blocks for the three timezone functions 
PHPBB3-9558
 2012-06-18 15:10:59 +02:00
Joas Schilling
2c4677b79e [feature/new-tz-handling] Remove function getTimestamp() as we require php 5.3 
PHPBB3-9558
 2012-06-18 15:10:50 +02:00
Joas Schilling
fb77b6b70c [feature/new-tz-handling] Fix documentation in includes/datetime.php 
PHPBB3-9558
 2012-06-18 15:10:40 +02:00
Joas Schilling
9836efc13c [feature/new-tz-handling] Inject $user to avoid the usage of global 
PHPBB3-9558
 2012-06-18 15:10:33 +02:00