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

1126 Commits

Author SHA1 Message Date
Andreas Fischer
72f0e2dd79 Merge remote-tracking branch 'mvinny/ticket/11139' into develop
* mvinny/ticket/11139:
  [ticket/11139] Adding the $phpbb_admin_path variable
  [ticket/11139] Fix fatal error on colour swatch window
2012-10-15 19:49:28 +02:00
Vinny
571d352eed [ticket/11139] Adding the $phpbb_admin_path variable
PHPBB3-11139
2012-10-15 14:32:49 -03:00
Vinny
5db30e66fd [ticket/11139] Fix fatal error on colour swatch window
PHPBB3-11139
2012-10-09 00:31:59 -03: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
Senky
1f89fc9cb6 [ticket/11112] updating links to phpbb.com to use SSL
PHPBB3-11112
2012-10-01 15:38:16 +02:00
Unknown Bliss
323bbf9b52 [ticket/10631] Adjust prefixes to be easier to understand
PHPBB3-10631
2012-09-01 15:05:57 +01:00
Nathan Guse
7b643fe8a5 [ticket/10631] Make failure to meet ext enable requirements clearer
Turn the blocks red on the details page if requirement is not met.

Also changing a how the errors come up when trying to enable/disable
an extension when they cannot be.

PHPBB3-10631
2012-09-01 15:05:56 +01:00
Nathan Guse
dce04b2d03 [ticket/10631] Various front-end fixes (extensions manager)
Add Back button from details

Add cancel button from actions

Correct language strings

PHPBB3-10631
2012-09-01 15:05:54 +01:00
Nathan Guse
36465c9a20 [ticket/10631] Functional acp_extensions test, cleanup
PHPBB3-10631
2012-09-01 15:05:49 +01:00
Nathan Guse
89f4cf6a8c [ticket/10631] Use exceptions for errors. Build action list dynamically.
PHPBB3-10631
2012-09-01 15:05:34 +01:00
Nathan Guse
106c105113 [ticket/10631] Fix some issues as noted in github comments, significantly simplified validation
PHPBB3-10631
2012-09-01 15:05:32 +01:00
Nathan Guse
2273ae2b34 [ticket/10631] Remove references to delete extension
PHPBB3-10631
2012-09-01 15:05:30 +01:00
Nathan Guse
9c0cd2693f [ticket/10631] Make the enable/disable/purge notices more visable.
PHPBB3-10631
2012-09-01 15:05:28 +01:00
Nathan Guse
8bbab088dd [ticket/10631] Validation for extensions
PHPBB3-10631
2012-09-01 15:05:23 +01:00
Nathan Guse
28ca2d6a5f [ticket/10631] Stagger the enable/disable/purge for extensions
PHPBB3-10631
2012-09-01 15:05:18 +01:00
Nathan Guse
bf6e91b5f3 [ticket/10631] Fixing some more issues
PHPBB3-10631
2012-09-01 15:05:16 +01:00
Nathan Guse
3ba59c6362 [ticket/10631] Various tidbits and cleanup on the acp extensions manager
PHPBB3-10631
2012-09-01 15:05:12 +01:00
Michael Cullum
18cd1262b2 [ticket/10631] Fixing up the template
PHPBB3-10631
2012-09-01 15:05:08 +01:00
Michael Cullum
4cbfa61753 [ticket/10631] A few more extension admin changes
PHPBB3-10631
2012-09-01 15:04:55 +01:00
Michael Cullum
7a954d352e [ticket/10631] Fixing some items mentioned in PR
PHPBB3-10631
2012-09-01 15:04:53 +01:00
Michael Cullum
913b3fb0c1 [ticket/10631] Changing Ext Admin List to conform to standards
PHPBB3-10631
2012-09-01 15:04:45 +01:00
Michael Cullum
8824ccb392 [ticket/10631] Add an extension details page
PHPBB3-10631
2012-09-01 15:04:35 +01:00
Michael Cullum
5e6b4c7192 [ticket/10631] Adding an extensions admin
PHPBB3-10631
2012-09-01 15:04:33 +01:00
Andreas Fischer
9480a5e512 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value

Conflicts:
	phpBB/includes/acp/acp_profile.php
2012-07-23 15:50:54 +02:00
Nils Adermann
10172887fd [ticket/10965] Introduce a new profile field option to display no value
By default the 3.0.10 behaviour is kept, profile fields will not show up
if they have either not yet been selected or in case of an optional
dropdown field if the novalue option was selected.

PHPBB3-10965
2012-07-23 15:45:57 +02:00
Igor Wiedler
0e2a30a27b Merge branch 'develop' into feature/avatars
* develop: (201 commits)
  [feature/new-tz-handling] Don't use global user but make it a parameter
  [feature/new-tz-handling] Fix size of suggestion button in chrome
  [feature/new-tz-handling] Fall back to UTC, if the timezone is invalid
  [feature/new-tz-handling] Add previous selected value to validation if valid
  [feature/new-tz-handling] Display suggestion when a different value is selected
  [ticket/10998] Add border-radius to forum rules block - prosilver
  [feature/new-tz-handling] Remove additional marking of selected items
  [feature/new-tz-handling] Move update helper function to new class
  [feature/new-tz-handling] Fix unit test
  [feature/new-tz-handling] Delete old variable which is not used anymore
  [feature/new-tz-handling] Rename $user->tz back to $user->timezone
  [feature/pagination-as-list] New parameter for name of start var
  [feature/pagination-as-list] Updates for nils comments
  [feature/pagination-as-list] Rename and deprecate functions
  [feature/pagination-as-list] Various fixes and improvements
  [ticket/10968] Render pagination within the template
  [feature/new-tz-handling] Remove "timezone might be numeric"
  [feature/new-tz-handling] Add function to update the timezone
  [feature/new-tz-handling] Correctly update user and board timezones on update
  [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
  ...
2012-07-21 00:37:48 +02: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
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
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
Joas Schilling
4aabe0cd4d [ticket/10982] Remove overlay on first up/down move of forums in ACP
PHPBB3-10982
2012-07-11 14:54:31 +02:00
Andreas Fischer
d998ad4b15 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10773] ACP logo with registered trademark symbol
2012-07-01 00:20:04 +02:00
Patrick Webster
625333ea2e [ticket/10773] ACP logo with registered trademark symbol
PHPBB3-10773
2012-06-30 12:21:37 -05:00
Igor Wiedler
13f4bfabbe [feature/avatars] Fixup avatars.js rewrite
PHPBB3-10018
2012-06-27 21:00:00 +02:00
Igor Wiedler
2f3581fe3e [feature/avatars] Add self-invoking closure around avatars.js
PHPBB3-10018
2012-06-27 18:37:23 +02:00
Igor Wiedler
b060667ac1 [feature/avatars] Rewrite avatars event handler to use jQuery
PHPBB3-10018
2012-06-27 18:26:44 +02:00
Igor Wiedler
21df013210 [feature/avatars] Move avatars JavaScript code to external JS file
PHPBB3-10018
2012-06-27 18:23:26 +02:00
Igor Wiedler
1b3cb68c2f Merge remote-tracking branch 'upstream/develop' into feature/avatars
* upstream/develop: (255 commits)
  [ticket/10935] Limit number of PM rules per user to 5000
  [ticket/10801] Fixed quickmod tools.
  [ticket/9551] uncomment line and change length to 255
  [ticket/10925] Clarify installation requirements for SQLite
  [ticket/10938] Serve subforum listing on forumlist from template loop
  [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
  [ticket/10936] remove PCRE and mbstring support check
  [ticket/10936] fix language key
  [ticket/10829] Delete T_STYLESHEET_NAME - no longer used.
  [ticket/10829] $style_name -> $style_path in style class.
  [ticket/10743] Renaming user->theme
  [ticket/10743] Changing obtain_cfg_items
  [ticket/10882] Fix test name - oops.
  [ticket/10931] Apply strtolower() correctly, i.e. not on false.
  [ticket/10931] Also test get_bytes() and get_string() with false.
  [ticket/10931] Make to_numeric function globally available.
  [ticket/10932] Use included composer.phar in build process
  ...

Conflicts:
	phpBB/includes/mcp/mcp_warn.php
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_avatar_options.html
2012-06-27 14:47:13 +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
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
5f96e5d374 [feature/new-tz-handling] Fix timezone option when editing a user in the ACP
PHPBB3-9558
2012-06-18 15:09:45 +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
Nils Adermann
8438b61cef Merge remote-tracking branch 'github-dhruv/ticket/10308' into develop
By Dhruv Goel
via Dhruv Goel
* github-dhruv/ticket/10308:
  [ticket/10308] fixes indentation
  [ticket/10308] fixes language variable name
  [ticket/10308] makes variable boolean
  [ticket/10308] fixes sql query, limit it to 1
  [ticket/10308] fixes user deletion if no posts
  [ticket/10308] renames language key to USER_NO_POSTS_DELETE
  [ticket/10308] fix language and user's total posts
  [ticket/10308] fixes language entity.
  [ticket/10308] Displays message to user if there are no posts.
  [ticket/10308] disable retain/ delete posts option when deleting a user
2012-05-29 16:40:00 +02:00
Dhruv Goel
041b7be77e [ticket/10308] fixes indentation
indentation is fixed and user_posts variable is compared as a boolean
variable.

PHPBB3-10308
2012-05-11 01:50:36 +05:30
Dhruv Goel
cf556f92c9 [ticket/10308] fixes language variable name
Language variable has be renamed for better understanding

PHPBB3-10308
2012-05-10 22:54:29 +05:30
Dhruv Goel
164054f067 [ticket/10308] fixes sql query, limit it to 1
instead of fetching all posts by user we limit the query to 1 to check if
a user has posts or not

PHPBB3-10308
2012-05-10 22:53:04 +05:30
Dhruv Goel
cf303c3478 [ticket/10308] fixes user deletion if no posts
introduces a hidden input field with retain posts as the mode in case
user has no posts.

PHPBB3-10308
2012-05-10 22:51:22 +05:30