makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 05:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
18570 commits 18 branches 192 tags 207 MiB
Commit graph

18570 commits

This branch
This branch
All branches
Author SHA1 Message Date
Igor Wiedler
2f3581fe3e [feature/avatars] Add self-invoking closure around avatars.js 
PHPBB3-10018
 2012-06-27 18:37:23 +02:00
Igor Wiedler
b060667ac1 [feature/avatars] Rewrite avatars event handler to use jQuery 
PHPBB3-10018
 2012-06-27 18:26:44 +02:00
Igor Wiedler
21df013210 [feature/avatars] Move avatars JavaScript code to external JS file 
PHPBB3-10018
 2012-06-27 18:23:26 +02:00
Igor Wiedler
f40e6963c6 [feature/avatars] Remove empty script tag 
PHPBB3-10018
 2012-06-27 17:11:20 +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
Joas Schilling
d30dc11f3e [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms() 
Todo: Add cases to in which the msg is also deleted.

PHPBB3-10950
 2012-06-23 16:02:16 +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
Patrick Webster
08e319198c [ticket/10865] Grammar corrections for the entire document 
Fixed more grammatical issues, changed some phrasings, added a link
for offline conversions, and other corrections.

PHPBB3-10865
 2012-06-22 23:47:13 -05:00
Callum Macrae
d5a788ae5b [ticket/10949] Converted AJAX coding standards to new guidelines. 
Basically, moved parentheses to same line and changed variable names to
camel case.

PHPBB3-10949
 2012-06-21 19:16:05 +01: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
Andreas Fischer
f1414386d7 Merge remote-tracking branch 'nickvergessen/ticket/10935' into prep-release-3.0.11 
* nickvergessen/ticket/10935:
  [ticket/10935] Limit number of PM rules per user to 5000
 2012-06-21 10:30:41 +02:00
Callum Macrae
d6d85dea12 [ticket/10947] Fixed quickmod autosubmit functionality. 
PHPBB3-10947
 2012-06-20 22:34:17 +01: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
Andreas Fischer
ba21be88f5 Merge remote-tracking branch 'callumacrae/ticket/10801' into develop 
* callumacrae/ticket/10801:
  [ticket/10801] Fixed quickmod tools.
 2012-06-20 10:49:46 +02:00
Andreas Fischer
38e261c955 Merge remote-tracking branch 'imkingdavid/ticket/10938' into develop 
* imkingdavid/ticket/10938:
  [ticket/10938] Serve subforum listing on forumlist from template loop
 2012-06-20 10:44:32 +02:00
Andreas Fischer
69ef2f55cc Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10925] Clarify installation requirements for SQLite
 2012-06-20 10:31:35 +02:00
Andreas Fischer
3e80268249 Merge branch 'prep-release-3.0.11' into develop-olympus 
* prep-release-3.0.11:
  [ticket/10925] Clarify installation requirements for SQLite
 2012-06-20 10:31:23 +02:00
Andreas Fischer
155c93d71a Merge remote-tracking branch 'Noxwizard/ticket/10925' into prep-release-3.0.11 
* Noxwizard/ticket/10925:
  [ticket/10925] Clarify installation requirements for SQLite
 2012-06-20 10:31:08 +02:00
Joas Schilling
4fbbbfcebb [ticket/10942] Fix function name on order_lower_test.php 
PHPBB3-10942
 2012-06-20 02:12:48 +02:00
Joas Schilling
8cea7b2a51 [ticket/10942] Add unit tests for sql_concatenate 
PHPBB3-10942
 2012-06-20 02:10:54 +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
dd0da6fffb [ticket/10942] Add unit tests for sql_conditional 
PHPBB3-10942
 2012-06-20 01:50:42 +02:00
Joas Schilling
71374078b9 [ticket/10942] Add sql_conditional to dbal 
PHPBB3-10942
 2012-06-20 01:50:00 +02:00
Joas Schilling
902a79bfda [feature/new-tz-handling] Readd Database updater changes from Oleg 
The change here converts user_timezone to vchar and computes
timezone identifiers from the offsets. It uses database-specific
functions for building SQL conditionals and concatenations which
need to be implemented, probably in a separate ticket. As a result
the current code is not functional.

The changes are tricky since we need to drop user_dst column from
users table, but we need it during the data migration process to
properly calculate effective timezones for all users.

PHPBB3-9558
 2012-06-20 00:52:37 +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
Patrick Webster
5bc2219bbe [ticket/10865] Typo and phrasing change 
PHPBB3-10865
 2012-06-19 12:51:44 -05: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
Joas Schilling
dcd7d96296 [feature/new-tz-handling] Use asset in acp and subsilver2 and remove duplicates 
PHPBB3-9558
 2012-06-19 19:08:53 +02:00
Joas Schilling
7b4f9765f8 [feature/new-tz-handling] Move js functions into assets core.js 
PHPBB3-9558
 2012-06-19 18:57:20 +02:00
Callum Macrae
3f7d55a053 [ticket/10801] Fixed quickmod tools. 
Fixes 10801, 10802, 10807 and 10808.

PHPBB3-10801
 2012-06-19 17:28:30 +01:00