mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-26 21:21:32 +01:00
Code Issues Releases Wiki Activity
15,079 Commits 10 Branches 193 Tags
ffd531e4fd31fee31c6fbd8c94cb6077cd21a82d
Commit Graph

441 Commits

Author SHA1 Message Date
Nathan Guse
357a4facf6 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 
Conflicts:
	phpBB/includes/functions.php
 2012-12-09 13:24:43 -06:00
Andreas Fischer
bd987b6e14 Merge remote-tracking branch 'p/ticket/11095-develop' into develop 
* p/ticket/11095-develop:
  [ticket/11095] Restore brace on previous line.
  [ticket/11095] Docs and tests for phpbb_build_hidden_fields_for_query_params.
  [ticket/11095] Forward GET parameters into hidden fields for jumpbox.
  [ticket/11095] Python quoteattr port.
  [ticket/11095] Use get method in jumpboxes.
 2012-12-08 16:14:42 +01:00
Nathan Guse
0042f07147 Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 
Conflicts:
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
 2012-12-07 21:14:39 -06:00
Oleg Pudeyev
b07ae3fe59 Merge PR #1053 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10841] Revert more whitespace changes.
  [ticket/10841] Revert whitespace changes.
  [ticket/10841] adding space after if
  [ticket/10841] removing unnecessary spacing
  [ticket/10841] changing affectedrows check to COUNT in sql
  [ticket/10841] Modifying style and language selectors in UCP

Conflicts:
	phpBB/includes/ucp/ucp_prefs.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
 2012-12-05 12:21:25 -05:00
Oleg Pudeyev
0793f8e2e6 [ticket/10841] Revert whitespace changes. 
PHPBB3-10841
 2012-12-05 12:07:37 -05:00
Senky
af064cdaad [ticket/10841] Modifying style and language selectors in UCP 
Commit also deletes all unnecessary blank spaces at
the end of the lines in both ucp_prefs_personal.html

PHPBB3-10841
 2012-12-05 12:07:37 -05:00
Oleg Pudeyev
2a39df1a53 [ticket/11095] Forward GET parameters into hidden fields for jumpbox. 
PHPBB3-11095
 2012-11-29 13:36:00 -05:00
Oleg Pudeyev
83e85810aa [ticket/11095] Use get method in jumpboxes. 
PHPBB3-11095
 2012-11-29 01:14:58 -05:00
Nathan Guse
61aa53f91a Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 
Conflicts:
	phpBB/config/services.yml
	phpBB/index.php
 2012-11-20 23:19:51 -06:00
Oleg Pudeyev
9c86f70b4a Merge PR #1041 branch 'cyberalien/ticket/11175' into develop 
* cyberalien/ticket/11175:
  [ticket/11175] Add microdata to prosilver
  [ticket/11175] Add microdata to subsilver2
 2012-11-15 22:09:52 -05:00
Vjacheslav Trushkin
9b2024a48e [ticket/11175] Add microdata to subsilver2 
Add breadcrumb data to subsilver2

PHPBB3-11175
 2012-11-11 11:11:47 +01:00
Nathaniel Guse
68363e362d Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 
Conflicts:
	phpBB/install/schemas/mssql_schema.sql
	phpBB/report.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
 2012-11-10 10:58:44 -06:00
Nathan Guse
6e7e70a18a [ticket/10780] Replace colon usage in template output with {L_COLON} 
Replace all the instances (I could find) where the colon is displayed
to the user with {L_COLON} so it can be localised.

PHPBB3-10780
 2012-11-10 00:23:03 +01:00
Andreas Fischer
ee29cc1678 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11081] Drop duplicated </td> in subsilver captcha qa template.
 2012-11-07 22:57:40 +01:00
Oleg Pudeyev
87a80e70da [ticket/11081] Drop duplicated </td> in subsilver captcha qa template. 
PHPBB3-11081
 2012-11-06 17:46:54 -05:00
Nathan Guse
4874226b6e [ticket/11103] Re-add notify method to the UCP preferences 
I've noticed that this is used in other areas still in phpBB, so it should
not be removed.

PHPBB3-11103
 2012-10-20 22:11:41 -05:00
Nathan Guse
a93067eb41 [ticket/11103] Create common.js for subsilver2, move added JS code there 
PHPBB3-11103
 2012-10-19 16:00:37 -05:00
Nathan Guse
2c06c2bd36 [ticket/11103] Declare $ for jQuery, check for instance of, newlines at eof 
PHPBB3-11103
 2012-10-18 19:20:54 -05:00
Joas Schilling
7ce43d49d8 [ticket/11014] Fix IF statements for new template pagination 
PHPBB3-11014
 2012-10-17 23:34:37 +02:00
Joas Schilling
7675d72622 [ticket/11014] Fix text for previous/next links in Subsilver2 
PHPBB3-11014
 2012-10-17 23:34:37 +02:00
Nathan Guse
0d098ae5e5 [ticket/11103] Return false to prevent appending # to the URL 
PHPBB3-11103
 2012-10-16 18:14:06 -05:00
Nathan Guse
3557b39115 [ticket/11103] Hide notifications flyout on a click outside of the list. 
PHPBB3-11103
 2012-10-16 17:31:48 -05:00
Nathan Guse
a080af4b05 [ticket/11103] Add title/view all link to subsilver2 
PHPBB3-11103
 2012-10-16 17:28:45 -05:00
Nathaniel Guse
c8b66a26ef [ticket/11103] Mark read link if notification has no URL to view it 
Other style stuff

PHPBB3-11103
 2012-10-16 10:51:07 -05:00
Nathaniel Guse
a2d6e40f1b [ticket/11103] If no avatar, do not display an empty box in subsilver2 
PHPBB3-11103
 2012-10-15 09:27:01 -05:00
Nathan Guse
077c526f15 [ticket/11103] ss2 - do not include footer bar if no pagination 
PHPBB3-11103
 2012-10-14 14:30:05 -05:00
Nathan Guse
4e3abdb7c5 [ticket/11103] subsilver2 ucp_notifications.html 
PHPBB3-11103
 2012-10-14 14:28:28 -05:00
Nathan Guse
c1f8c96bd7 [ticket/11103] subsilver2 overall_header.html 
PHPBB3-11103
 2012-10-14 13:46:15 -05:00
Nathan Guse
6ded18b6e2 [ticket/11103] subsilver2 ucp_prefs_personal.html edits 
PHPBB3-11103
 2012-10-14 13:26:33 -05:00
Oleg Pudeyev
59281f1b0a Merge PR #973 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11069] Add closing span back to credit line in subsilver2 simple footer
 2012-10-10 00:22:38 -04:00
Oleg Pudeyev
68641aab93 Merge PR #973 branch 'bantu/ticket/11069' into develop-olympus 
* bantu/ticket/11069:
  [ticket/11069] Add closing span back to credit line in subsilver2 simple footer
 2012-10-10 00:22:17 -04:00
Andreas Fischer
a38de9a232 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11135] Full replacement of credit link to https

Conflicts:
	phpBB/install/convertors/convert_phpbb20.php
 2012-10-06 06:15:01 +02:00
Vinny
95d02d74ac [ticket/11135] Full replacement of credit link to https 
PHPBB3-11135
 2012-10-05 21:18:59 -03:00
Andreas Fischer
9a92c45ad3 Merge remote-tracking branch 'EXreaction/ticket/11021' into develop 
* EXreaction/ticket/11021:
  [ticket/11021] Fix the language changes that were lost previously
 2012-09-15 18:31:13 +02:00
Nathan Guse
9e5505933a [ticket/11021] Fix the language changes that were lost previously 
Change U_HOME to U_SITE_HOME

PHPBB3-11021
 2012-09-15 11:28:58 -05:00
Andreas Fischer
5dc7aba18f Merge remote-tracking branch 'EXreaction/ticket/11021' into develop 
* EXreaction/ticket/11021:
  [ticket/11021] Remove unnecessary line spacing in functions.php
  [ticket/11021] Use L_SITE_HOME instead of L_HOME
  [ticket/11021] Better language strings for site home url/text
  [ticket/11021] subsilver2 support
  [ticket/11021] Add the option to specify a Site home URL and text
 2012-09-15 17:48:51 +02:00
Nathan Guse
7a47013994 [ticket/11021] Use L_SITE_HOME instead of L_HOME 
Check site home url against !== '', not empty

PHPBB3-11021
 2012-09-15 10:44:18 -05:00
Andreas Fischer
c83ca457a0 [ticket/11069] Add closing span back to credit line in subsilver2 simple footer 
Regression from 0ceb77fb99.

PHPBB3-11069
 2012-08-26 17:20:45 +02:00
Andreas Fischer
fa06b779ad Merge remote-tracking branch 'nickvergessen/ticket/11004' into develop 
* nickvergessen/ticket/11004:
  [ticket/11004] Always update suggestion button in timezone_preselect_select
  [ticket/11003] Ability to show full list of timezones with JavaScript enabled
  [ticket/11004] Make suggestion button a real button and fix it's value
 2012-08-02 12:10:26 +02:00
Matt Friedman
4ff644890a [ticket/11025] Replace <b> with <strong> and/or class for semantic styling in subsilver2 
PHPBB3-11025
 2012-07-23 18:43:28 -07:00
Matt Friedman
8c337a260b [ticket/11025] Replace <b> with <strong> and/or class for semantic styling 
PHPBB3-11025
 2012-07-23 18:33:32 -07:00
Matt Friedman
eeb7b1bac3 [ticket/11025] Make last topic titles in forum list Bold 
This small style tweak will make the truncated last topic titles
shown in the forum list BOLD for better visual impact.

PHPBB3-11025
 2012-07-23 17:08:40 -07:00
Joas Schilling
22951e4367 [ticket/11004] Make suggestion button a real button and fix it's value 
PHPBB3-11004
 2012-07-23 17:02:40 +02:00
Nathan Guse
ffe7f76b90 [ticket/11021] subsilver2 support 
PHPBB3-11021
 2012-07-22 22:58:43 -05:00
Igor Wiedler
ca43a8947a [ticket/11008] Remove eval() calls to get document[id] 
PHPBB3-11008
 2012-07-21 00:12:37 +02:00
Nils Adermann
737828f009 Merge pull request #843 from nickvergessen/feature/new-tz-handling 
Feature/new tz handling
 2012-07-19 08:46:25 -07: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
Joas Schilling
f4136eacdc Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/new-tz-handling 2012-07-18 11:07:32 +02:00
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