Commit graph

424 commits

Author SHA1 Message Date
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
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
Senky
2dd71f6520 [ticket/10835] fixing misleading message in UCP
PHPBB3-10835
2012-05-01 09:52:48 +02:00
galaxyAbstractor
8d45901657 [ticket/10849] Added missing helptext for listitem
Added the missing helptext for list item in subsilver2.

PHPBB3-10849
2012-04-27 22:19:41 +02: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
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
4771af0833 [ticket/10783] Added assets_version to subsilver2.
PHPBB3-10783
2012-04-11 14:33:09 +01:00
Oleg Pudeyev
7d6b289671 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10607] Added 'Powered by' translation string.

Conflicts:
	phpBB/adm/index.php
	phpBB/language/en/common.php
2012-04-04 15:33:51 -04:00
Vjacheslav Trushkin
e769e0f723 [ticket/10762] Changing version format in style.cfg
Splitting version into style_version and phpbb_version in style.cfg

PHPBB3-10762
2012-04-04 13:07:24 +03:00
Fyorl
0ceb77fb99 [ticket/10607] Added 'Powered by' translation string.
Added POWERED_BY line to common.php and modified the templates
to use it.

PHPBB3-10607
2012-04-04 11:38:15 +08:00
rxu
bf0a3ddaca Merge pull request #670 from imkingdavid/feature/qrpreview
[feature/qrpreview] Preview from Quick Reply
2012-04-01 11:28:47 -07:00
Vjacheslav Trushkin
b548389207 Merge remote-tracking branch 'upstream/develop' into ticket/10665
* upstream/develop:
  [ticket/10733] Fixing test
  [ticket/10733] Removing static from data providers
  [ticket/10731] Fixed addquote() to work on opera browser.
  [ticket/10731] Fixed addquote() to work on opera browser.
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
  [ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2
  [ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilver
  [ticket/10705] Change WARNINGS_ZERO_TOTAL in en language
  [ticket/10675] Add disk full language string when posting attachments
2012-04-01 19:28:37 +03:00
Hari Sankar R
b1b530f92c [ticket/10731] Fixed addquote() to work on opera browser.
In opera, window.getSelection() returned incorrect values, should be using
document.getSelection() instead. Fixed in prosilver and subsilver2 templates.

PHPBB3-10731
2012-04-01 17:05:31 +03:00
Hari Sankar R
e7cf4bfb2e [ticket/10731] Fixed addquote() to work on opera browser.
In opera, window.getSelection() returned incorrect values, should be using
document.getSelection() instead. Fixed in prosilver and subsilver2 templates.

PHPBB3-10731
2012-04-01 18:25:50 +05:30
Vjacheslav Trushkin
2225efc560 [ticket/10665] INCLUDEJS template changes
Implementing INLCUDEJS template tag in styles

PHPBB3-10665
2012-04-01 10:58:59 +03:00
David King
26a999c83c Merge remote-tracking branch 'brunoais/ticket/10705' into develop 2012-03-31 13:49:49 -04:00
Vjacheslav Trushkin
398a6c8045 Merge branch 'develop' into feature/merging-style-components
* develop: (175 commits)
  [feature/ajax] Remove strange non-breaking spaces from approve button
  [feature/ajax] Add entirely unrelated but nice newlines
  [feature/ajax] Unify phpbb_json_response instantiation
  [feature/ajax] Fix acp_styles activate_deactivate ajax callback name
  [feature/ajax] Send correct activate/deactivate JSON response in acp_profile
  [ticket/10270] Alter background colors for posts
  [feature/ajax] Remove not working module enable/disable ajax code
  [feature/ajax] Replace static call to phpbb_request with OO
  [feature/ajax] Remove quick-reply AJAX handling until we have something good
  [ticket/10270] Changing close button for ajax popups
  [ticket/10270] Disabling links in disappearing content
  [ticket/10291] Fixed an AJAX bug on quick reply form submit.
  [ticket/10273] Fixed accepting / denying posts AJAX.
  [ticket/10272] Removed code that was prevent event propogation in AJAX.
  [ticket/10291] Fixed a bug in the quick reply AJAX.
  [feature/ajax] Handle acp_modules error cases with JSON response
  [feature/ajax] Fix filter check, quick mod tools data-attribute
  [feature/ajax] Use the error handler
  [feature/ajax] Generic error handling with a phpbb.alert box
  [feature/ajax] Change filter semantics, some minor adjustments
  ...

Conflicts:
	phpBB/adm/style/acp_styles.html
	phpBB/includes/acp/acp_styles.php
2012-03-31 10:43:06 +03:00
David King
a7045e6572 [feature/qrpreview] Preview from Quick Reply
PHPBB3-10726
2012-03-30 21:43:00 -04:00
David King
dc07617c19 Merge branch 'callumacrae/ticket/10510-' into develop 2012-03-30 18:28:18 -04:00
Vjacheslav Trushkin
ba431def5d Merge remote-tracking branch 'upstream/develop' into feature/merging-style-components
* upstream/develop: (65 commits)
  [ticket/10730] Added label tag around "select" text in post splitting UI
  [ticket/10732] Add config_dev.php and config_test.php to .gitignore
  [ticket/10586] Added space in if statement
  [ticket/10586] Tidy up comments
  [task/php5.3] Updated range of tested PHP versions
  [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2
  [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
  [ticket/10723] Stop Travis running all tests on sqlite
  [ticket/10703] Added a condition to check if ext directory exists
  [task/travis] Refactor php version check for dbunit install
  [task/travis] Exclude functional and slow tests
  [ticket/10719] Revert "Skip functional tests on PHP 5.2"
  [task/travis-develop2] Update version from 5.3 to 5.3.2
  [task/travis] Dropping support for 5.2 in develop branch
  [task/travis] Some more small travis fixes
  [task/travis] Rename travis phpunit config files
  [task/travis] Fixing some travis issues
  [ticket/10684] Adjust function and parameter name, minor changes.
  [task/travis] Add automated testing to readme
  [task/travis] Removing development information
  ...

Conflicts:
	phpBB/install/database_update.php
2012-03-29 22:38:07 +03:00
Bruno Ais
56629d8e3c [ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2
Located the L_WARNINGS_ZERO_TOTAL in subsilver2 and replaced it with
L_NO_WARNINGS

PHPBB3-10705
2012-03-29 15:52:28 +01:00
Bruno Ais
3a044b4b3e [feature/save-post-on-report] Changed mark in subsilver2 to look like viewtopic
As cyberalien requested. This was changed to match better the idea behind
what was made in prosilver to subsilver2.

PHPBB3-10600
2012-03-19 08:27:32 -04:00
Bruno Ais
c241a4a2b4 [feature/save-post-on-report] Saves the post reported when a report is creat
A problem when creating a report is that the report may be made and then
the post changed. After the changes, if the report is seen the message
it shows may not be correct to be reported. With these changes, when
a report is created the system copies the post that was reported and
shows it in the report details in the MCP

PHPBB3-10600
2012-03-19 08:27:31 -04:00
Callum Macrae
c52e99fdbb [ticket/10510] Fixed a bug where quickmod tools weren't being displayed.
It was referring to some template variables that were removed in a
previous commit. Changed!

PHPBB3-10510
2012-03-17 18:06:45 +00:00