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
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
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
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
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
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
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
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
Joas Schilling
a6bace039a
[feature/new-tz-handling] Fix timezone selection in subsilver2
...
PHPBB3-9558
2012-06-18 15:09:25 +02:00
Michael Cullum
a41f86f2f7
[ticket/10640] Change subject length in mcp in subsilver
...
PHPBB3-10640
2012-06-17 19:22:50 +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
Joas Schilling
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
Andreas Fischer
d8ddda5121
[develop-olympus] Bumping version numbers to final for 3.0.11 releases.
2012-05-31 20:19:28 +02:00
Vinny
a32a5925b3
[ticket/10905] Last topic title for subsilver2
...
PHPBB3-10905
2012-05-22 15:34:39 -03: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
ca0d5ebf7a
[feature/delete-auto-logins] template added for subsilver2
...
PHPBB3-9647
2012-05-17 14:02:31 +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
Oleg Pudeyev
1fcb269616
Merge PR #785 branch 'Senky/ticket/10835' into develop-olympus
...
* Senky/ticket/10835:
[ticket/10835] changing "e-mail" to "email"
[ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry
[ticket/10835] fixing misleading message in UCP
2012-05-11 02:32:58 -04:00
Andreas Fischer
9d827f491f
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10849] Added missing helptext for listitem
2012-05-05 22:50:08 +02:00