1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-14 13:46:33 +02:00
Commit Graph

1585 Commits

Author SHA1 Message Date
737828f009 Merge pull request #843 from nickvergessen/feature/new-tz-handling
Feature/new tz handling
2012-07-19 08:46:25 -07:00
8b230f59db Merge remote-tracking branch 'mvinny/ticket/10998' into develop
* mvinny/ticket/10998:
  [ticket/10998] Add border-radius to forum rules block - prosilver
2012-07-19 16:35:16 +02:00
5b7884907c [feature/new-tz-handling] Fix size of suggestion button in chrome
PHPBB3-9558
2012-07-19 16:13:16 +02:00
5a068867ee [ticket/10998] Add border-radius to forum rules block - prosilver
PHPBB3-10998
2012-07-18 21:42:23 -03:00
dc71c0629e [feature/pagination-as-list] Various fixes and improvements
Extracted common template code for prosilver as per subsilver2.
Various other fixups and oversight corrections, changed name
of the "new" template function and re-introduced existing
version. Altered on_page to compensate for removal of some
templating vars from pagination routine.

PHPBB3-10968
2012-07-18 14:31:21 +01:00
922147f05a [ticket/10968] Render pagination within the template
Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.

Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.

PHPBB3-10968
2012-07-18 14:30:20 +01:00
f4136eacdc Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/new-tz-handling 2012-07-18 11:07:32 +02:00
0de3b899c7 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10789] Remove unnecessary variables from PM print - prosilver
2012-07-17 20:42:30 +02:00
3a70bc2c75 Merge remote-tracking branch 'mvinny/ticket/10789' into develop-olympus
* mvinny/ticket/10789:
  [ticket/10789] Remove unnecessary variables from PM print - prosilver
2012-07-17 20:42:17 +02:00
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
dd6955f833 [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
PHPBB3-10978
2012-07-09 19:29:17 -05:00
576cd6dd1e Merge PR #854 branch 'dhruvgoel92/ticket/10943' into develop
* dhruvgoel92/ticket/10943:
  [ticket/10943] displays searched query in search result
  [ticket/10943] use keywords variable to display in search box
2012-07-07 21:30:42 -04:00
b98be2f235 [ticket/10943] displays searched query in search result
Search backend displays an additional normalized search query just above
the ignored words.

PHPBB3-10943
2012-07-08 02:51:58 +05:30
1526886e3e Merge PR #832 branch 'dhruvgoel92/feature/postgresql-fulltext-search' into develop
* dhruvgoel92/feature/postgresql-fulltext-search: (28 commits)
  [feature/postgresql-fulltext-search] supports_phrase_search function
  [feature/postgresql-fulltext-search] use proper variable name
  [feature/postgresql-fulltext-search] each config is checked if it is set
  [feature/postgresql-fulltext-search] fix formatting
  [feature/postgresql-fulltext-search] add docblocks to functions
  [feature/postgresql-fulltext-search] remove phrase search code
  [feature/postgresql-fulltext-search] define access control specifiers
  [feature/postgresql-fulltext-search] use version_compare
  [feature/postgresql-fulltext-search] fix language key
  [feature/postgresql-fulltext-search] remove Readme
  [feature/postgresql-fulltext-search] removes pcre check
  [feature/postgresql-fulltext-search] fix language tsearch2 to text search
  [feature/postgresql-fulltext-search] remove mbstring support
  [feature/postgresql-fulltext-search] change language for pgsql < 8.3
  [feature/postgresql-fulltext-search] use phpbb_pcre_utf8_support()
  [feature/postgresql-fulltext-search] fix variable name
  [feature/postgresql-fulltext-search] Fix version comparison for 9.0+.
  [feature/postgresql-fulltext-search] fixing license
  [feature/postgresql-fulltext-search] assign empty stats
  [feature/postgresql-fulltext-search] remove backward compatibility
  ...
2012-07-07 16:19:53 -04:00
19d76f76dc [feature/postgresql-fulltext-search] remove phrase search code
Unused Code for phrase search removed as pgsql doesnt support it. An added
message is displayed if user tries to perform exact phrase search.

PHPBB3-9730
2012-07-05 21:17:23 +05:30
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
f1056a9b2f [ticket/10811] Make toogle_subscribe more generic so it can toogle all links
PHPBB3-10811
2012-07-05 01:03:19 +02:00
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
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
dcd7d96296 [feature/new-tz-handling] Use asset in acp and subsilver2 and remove duplicates
PHPBB3-9558
2012-06-19 19:08:53 +02:00
7b4f9765f8 [feature/new-tz-handling] Move js functions into assets core.js
PHPBB3-9558
2012-06-19 18:57:20 +02:00
3f7d55a053 [ticket/10801] Fixed quickmod tools.
Fixes 10801, 10802, 10807 and 10808.

PHPBB3-10801
2012-06-19 17:28:30 +01:00
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
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
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
c21275fa95 [feature/new-tz-handling] Use js and data attributes to create the events
PHPBB3-9558
2012-06-18 15:10:14 +02:00
8d65f1f7d2 [feature/new-tz-handling] Add doc blocks to js functions
PHPBB3-9558
2012-06-18 15:10:04 +02:00
5441ee1ee4 [feature/new-tz-handling] Use jQuery and INCLUDEJS for javascript
PHPBB3-9558
2012-06-18 15:09:55 +02:00
a6bace039a [feature/new-tz-handling] Fix timezone selection in subsilver2
PHPBB3-9558
2012-06-18 15:09:25 +02:00
4fbee37752 [feature/new-tz-handling] Move timezone option into its own template file
This should make it much easier for extensions to change the handling of the timezone selection

PHPBB3-9558
2012-06-18 15:09:12 +02:00
66f7d45603 [feature/new-tz-handling] Introduce 2 step timezone selection using javascript
PHPBB3-9558
2012-06-18 15:08:57 +02:00
a41f86f2f7 [ticket/10640] Change subject length in mcp in subsilver
PHPBB3-10640
2012-06-17 19:22:50 +01:00
7a6a5738db [ticket/10640] Change subject length in MCP
PHPBB3-10640
2012-06-17 19:07:21 +01:00
53d8464776 [ticket/10640] Change maximum subject length
PHPBB3-10640
2012-06-17 19:07:09 +01:00
5acbf0980d Merge remote-tracking branch 'github-dhruvgoel92/feature/delete-auto-logins' into develop
* github-dhruvgoel92/feature/delete-auto-logins:
  [feature-delete-auto-logins] adds module to database update
  [feature/delete-auto-logins] fixes style
  [feature/delete-auto-logins] improves styling
  [feature/delete-auto-logins] fixes language entry
  [feature/delete-auto-logins] fix language keys and styling
  [feature/delete-auto-logins] explain persistent keys in the ucp.
  [feature/delete-auto-logins] template added for subsilver2
  [feature/delete-auto-logins] improved styling and fixes language
  [feature/delete-auto-logins] using loop for errors
  [feature/delete-auto-logins] fixes css corners
  [feature/delete-auto-logins] Fixes language entries
  [feature/delete-auto-logins] checks form key
  [feature/delete-auto-logins] Fixes language entries and redirection.
  [feature/delete-auto-logins] User can view/delete auto logins.
2012-06-11 23:39:09 +02:00
8f027b68d6 Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling
Conflicts:
	phpBB/includes/functions_profile_fields.php
	phpBB/includes/session.php
	phpBB/install/database_update.php
2012-06-04 18:09:35 +02:00
d8ddda5121 [develop-olympus] Bumping version numbers to final for 3.0.11 releases. 2012-05-31 20:19:28 +02:00
af3a730d91 [ticket/10789] Remove unnecessary variables from PM print - prosilver
PHPBB3-10789
2012-05-22 15:56:13 -03:00
a32a5925b3 [ticket/10905] Last topic title for subsilver2
PHPBB3-10905
2012-05-22 15:34:39 -03:00
3b6ca178aa Merge PR #721 branch 'rahulr92/ticket/10650' into develop
* rahulr92/ticket/10650:
  [ticket/10650] Subject is cleared if no permissions exist
  [ticket/10650] Changed apostrophe to utf8 single quote
  [ticket/10650] Moving censoring to before truncation
  [ticket/10650] Added apostrophe in explanation in language file
  [ticket/10650] Inserted correct utf ELLIPSIS character
  [ticket/10650] Added space after if and comment
  [ticket/10650] Added ellipsis to language file
  [ticket/10650] Added href title to subject link
  [ticket/10650] Made use of truncate_string() function
  [ticket/10650] Removed changes from acp_forums.php
  [ticket/10650]Removed incorrect newline
  [ticket/10650] Changed acp option from per forum to global
  [ticket/10650] Added checking for empty subjects
  [ticket/10650] Corrected intendation
  [ticket/10650]Added permission checking and utf8 functions
  [ticket/10650] Cropped subject and inserted newline
  [ticket/10650] Corrected space before true
  [ticket/10650] Changed language files and forumlist
  [ticket/10650] Added static sql files
  [ticket/10650] Displaying last topic on forum list

Conflicts:
	phpBB/install/database_update.php
	phpBB/language/en/common.php
2012-05-21 23:42:48 -04:00
73ca5edb29 [feature/delete-auto-logins] fixes style
removes reset button and some minor style fixes in subsilver2 and
prosilver.

PHPBB3-9647
2012-05-17 14:08:50 +05:30
d612a7e647 [feature/delete-auto-logins] improves styling
PHPBB3-9647
2012-05-17 14:02:41 +05:30
9db1ed6e80 [feature/delete-auto-logins] fix language keys and styling
introduction of language variables instead of hardcoded language.

PHPBB3-9647
2012-05-17 14:02:36 +05:30
ca0d5ebf7a [feature/delete-auto-logins] template added for subsilver2
PHPBB3-9647
2012-05-17 14:02:31 +05:30
71f8416480 [feature/delete-auto-logins] improved styling and fixes language
Table ahs been styled. Date is now formatted properly instead of
the unix timestamp being displayed earlier. fixes small mistake in language
entry

PHPBB3-9647
2012-05-17 14:02:28 +05:30
bdf66b27ab [feature/delete-auto-logins] using loop for errors
instead of hardcoding html code into ERROR variable, we use errors array
and use loop in template file.

PHPBB3-9647
2012-05-17 14:02:25 +05:30
d5b1e108f9 [feature/delete-auto-logins] fixes css corners
PHPBB3-9647
2012-05-17 14:02:22 +05:30
5ce46cc960 [feature/delete-auto-logins] User can view/delete auto logins.
User has an extra option in UCP->Profile to view the auto logins and
clear them.

PHPBB3-9647
2012-05-17 14:02:12 +05:30
fc3a19567f [ticket/10811] Make it easier for MODs/Extensions to define the alt-text
PHPBB3-10811
2012-05-16 13:44:40 +02:00
03d3f9adb5 Merge PR #785 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10835] changing "e-mail" to "email"
  [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry
  [ticket/10835] fixing misleading message in UCP

Conflicts:
	phpBB/language/en/ucp.php
2012-05-11 02:37:25 -04:00