1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

12672 Commits

Author SHA1 Message Date
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
Andreas Fischer
d998ad4b15 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10773] ACP logo with registered trademark symbol
2012-07-01 00:20:04 +02:00
Andreas Fischer
3ecc43d48c Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10773] ACP logo with registered trademark symbol
2012-07-01 00:19:52 +02:00
Patrick Webster
625333ea2e [ticket/10773] ACP logo with registered trademark symbol
PHPBB3-10773
2012-06-30 12:21:37 -05:00
Patrick Webster
6203ef0c61 [ticket/10441] Typo
PHPBB3-10441
2012-06-29 12:10:14 -05:00
Oyabun1
c9f9e66328 [ticket/10441] Update to docs/README.html
Updated information about styles, languages, and MODs
Added a section about the Knowledge Base.
Various phrase changes.

PHPBB3-10441
2012-06-29 01:39:14 -05:00
Andreas Fischer
2d250247f4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10850] Changed the fopen mode to wb
2012-06-28 23:11:08 +02:00
Bruno Ais
3baeb4276d [ticket/10850] Changed the fopen mode to wb
Changed the fopen mode from "wt" to "wb" as requested in the PR.
The objective behind this is to prevent writting stuff like "\r\r\n" in
windows

PHPBB3-10850
2012-06-28 23:10:12 +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
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
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
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
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
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
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
Joas Schilling
79a0390970 [feature/new-tz-handling] Fix javascript in prosilver
Use new coding guidelines, wrap code with (function($)) and use phpbb. prefix

PHPBB3-9558
2012-06-19 15:41:18 +02:00
Patrick Webster
d26606f986 [ticket/10925] Clarify installation requirements for SQLite
PHPBB3-10925
2012-06-19 01:20:58 -05:00
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
David King
58a3342c3e [ticket/10938] Serve subforum listing on forumlist from template loop
Subforum listing is available both via implode()-ed PHP loop and
via template loop. The latter allows more flexibility for changing
the subforum listing per style, so that is the better option.

PHPBB3-10938
2012-06-18 12:26:28 -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
Joas Schilling
2a880dafdf [feature/new-tz-handling] Do not use underscore as prefix for user
PHPBB3-9558
2012-06-18 15:10:22 +02:00
Joas Schilling
c21275fa95 [feature/new-tz-handling] Use js and data attributes to create the events
PHPBB3-9558
2012-06-18 15:10:14 +02:00
Joas Schilling
8d65f1f7d2 [feature/new-tz-handling] Add doc blocks to js functions
PHPBB3-9558
2012-06-18 15:10:04 +02:00
Joas Schilling
5441ee1ee4 [feature/new-tz-handling] Use jQuery and INCLUDEJS for javascript
PHPBB3-9558
2012-06-18 15:09:55 +02:00