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

938 Commits

Author SHA1 Message Date
Drae
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
Drae
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
Andreas Fischer
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
Andreas Fischer
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
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
Patrick Webster
dd6955f833 [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
PHPBB3-10978
2012-07-09 19:29:17 -05:00
Oleg Pudeyev
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
Dhruv Goel
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
Oleg Pudeyev
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
Dhruv Goel
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
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
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
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
Callum Macrae
3f7d55a053 [ticket/10801] Fixed quickmod tools.
Fixes 10801, 10802, 10807 and 10808.

PHPBB3-10801
2012-06-19 17:28:30 +01: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
Michael Cullum
7a6a5738db [ticket/10640] Change subject length in MCP
PHPBB3-10640
2012-06-17 19:07:21 +01:00
Michael Cullum
53d8464776 [ticket/10640] Change maximum subject length
PHPBB3-10640
2012-06-17 19:07:09 +01:00
Nils Adermann
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
Andreas Fischer
d8ddda5121 [develop-olympus] Bumping version numbers to final for 3.0.11 releases. 2012-05-31 20:19:28 +02:00
Vinny
af3a730d91 [ticket/10789] Remove unnecessary variables from PM print - prosilver
PHPBB3-10789
2012-05-22 15:56:13 -03:00
Oleg Pudeyev
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
Dhruv Goel
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
Dhruv Goel
d612a7e647 [feature/delete-auto-logins] improves styling
PHPBB3-9647
2012-05-17 14:02:41 +05:30
Dhruv Goel
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
Dhruv Goel
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
Dhruv Goel
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
Dhruv Goel
d5b1e108f9 [feature/delete-auto-logins] fixes css corners
PHPBB3-9647
2012-05-17 14:02:22 +05:30
Dhruv Goel
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
Joas Schilling
fc3a19567f [ticket/10811] Make it easier for MODs/Extensions to define the alt-text
PHPBB3-10811
2012-05-16 13:44:40 +02:00
Oleg Pudeyev
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
Vinny
7294c71431 [ticket/10778] Remove extra space from close link in prosilver smilies window
PHPBB3-10778
2012-05-01 14:41:02 -03:00
Senky
2dd71f6520 [ticket/10835] fixing misleading message in UCP
PHPBB3-10835
2012-05-01 09:52:48 +02:00
Joas Schilling
53a47fdcc3 [ticket/10811] Make subscribe/unsubscribe repeatable with AJAX
PHPBB3-10811
2012-04-29 12:33:55 +02:00
Oleg Pudeyev
248559d7d1 Merge PR #734 branch 'shibulijack/ticket/10688' into develop
* shibulijack/ticket/10688:
  [ticket/10688] Update install.html for 3.1 and current practices.
  [ticket/10688] Update readme for 3.1 and current practices.
  [ticket/10688] Changed version 3.0 to 3.1
  [ticket/10688] Updated version to 3.1
  [ticket/10688] Changed 3.0 to 3.1 in docs

Conflicts:
	phpBB/docs/INSTALL.html
	phpBB/docs/README.html
2012-04-19 21:43:23 -04:00
Oleg Pudeyev
7fc4a184c2 Merge PR #592 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9089] Add tabindex to pm/topic/post icon-options aswell
  [ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subject
2012-04-19 21:03:15 -04:00
Oleg Pudeyev
6e77ca7c99 Merge PR #592 branch 'nickvergessen/ticket/9089' into develop-olympus
* nickvergessen/ticket/9089:
  [ticket/9089] Add tabindex to pm/topic/post icon-options aswell
  [ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subject
2012-04-19 21:02:48 -04:00
Nils Adermann
3d87ab79ca Merge remote-tracking branch 'github-cyberalien/ticket/10762' into develop
* github-cyberalien/ticket/10762:
  [ticket/10762] Check for phpbb_version when installing style
  [ticket/10762] Changing version format in style.cfg
2012-04-19 02:39:54 +02:00
Andreas Fischer
de7a166a59 Merge remote-tracking branch 'callumacrae/ticket/10783' into develop
* callumacrae/ticket/10783:
  [ticket/10783] Fixed an HTML error with assets_version.
2012-04-13 13:35:37 +02:00
Callum Macrae
875958573c [ticket/10783] Fixed an HTML error with assets_version.
PHPBB3-10783
2012-04-13 12:10:49 +01:00
Nils Adermann
790cc0c54f Merge remote-tracking branch 'github-callumacrae/ticket/10783' into develop
* github-callumacrae/ticket/10783:
  [ticket/10783] Added assets_version to ACP and simple_*.html.
  [ticket/10783] Added assets_version to subsilver2.
  [ticket/10783] Added ?assets_version to assets.
2012-04-13 03:32:01 +02:00
Callum Macrae
6ad58c7e04 [ticket/10783] Added assets_version to ACP and simple_*.html.
PHPBB3-10783
2012-04-11 14:37:15 +01:00
Callum Macrae
5665e82616 [ticket/10783] Added ?assets_version to assets.
PHPBB3-10783
2012-04-11 14:30:11 +01:00
Shibu Lijack
7fa2be51ce [ticket/10688] Changed version 3.0 to 3.1
Replaced phpBB 3.0 to 3.1 in the stylesheets

PHPBB-10688
2012-04-11 18:01:58 +05:30
Shibu Lijack
fd55c8664a Merge remote-tracking branch 'upstream/develop' into ticket/10734
Conflicts:
	phpBB/styles/prosilver/theme/tweaks.css
2012-04-10 21:46:14 +05:30
Shibu Lijack
daee253403 [ticket/10734] Fixed minor bug
Removed an extra empty line in colors.css

PHPBB-10734
2012-04-10 20:51:24 +05:30
Shibu Lijack
c1c71c26b4 [ticket/10734] Removed unwanted color elements
Deleted all the color elements from the common.css

PHPBB-10734
2012-04-10 19:48:00 +05:30
Shibu Lijack
fa04c3712b [ticket/10734] Moved style elements and fixed minor bugs
Moved color related style elements to colours.css and other elements to
common.css
Also added an empty display for corners span.
Removed unwanted space in mcp_topic
Removed DS_Store

PHPBB-10734
2012-04-09 18:43:54 +05:30
Rahul R
dd3b8e74b3 [ticket/10650] Added href title to subject link
Added title attribute to anchor tag which displays
last_post_subject so that the full subject can be
seen by hovering over the truncated subject displayed
in forumlist.

PHPBB3-10650
2012-04-08 12:45:51 +05:30