1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 13:04:24 +01:00

1328 Commits

Author SHA1 Message Date
Nils Adermann
7eaedcc8de Merge remote-tracking branch 'github-bantu/ticket/10550' into develop-olympus
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10550:
  [ticket/10550] Sort not installed styles list in the styles section of the ACP.
2012-05-31 15:43:09 +02:00
Nils Adermann
bafaf3700c Merge branch 'develop-olympus' into develop
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
  [ticket/10611] Filter out not existing database tables when making a backup.
  [ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables().
  [ticket/10611] Generate db_tools instance in acp_database module.
2012-05-31 15:34:58 +02:00
Andreas Fischer
9240ddbfa7 [ticket/10611] Filter out not existing database tables when making a backup.
Using $this->db_tools->sql_list_tables() as the first argument gives us table
names as array keys as a by-product which might be useful at some point.

PHPBB3-10611
2012-05-30 13:45:00 +02:00
Andreas Fischer
515c27270f [ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables().
get_tables() was deprecated by phpbb_db_tools::sql_list_tables()

This prevents unnecessarily loading functions_install.php

PHPBB3-10611
2012-05-30 13:41:36 +02:00
Andreas Fischer
6036b948ff [ticket/10611] Generate db_tools instance in acp_database module.
PHPBB3-10611
2012-05-30 13:38:41 +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
Andreas Fischer
701bf571df [ticket/10550] Sort not installed styles list in the styles section of the ACP.
PHPBB3-10550
2012-05-29 15:29:31 +02: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
23ea588880 [ticket/10308] makes variable boolean
makes user_row['user_has_posts'] boolean instead of 1 or 0.

PHPBB3-10308
2012-05-10 22:53:43 +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
59177a86c4 [ticket/10308] fix language and user's total posts
language modified to be clear and select box disappears in case no
posts by user. user's total posts are fetched using a new query.

PHPBB3-10308
2012-05-10 22:50:13 +05:30
Andreas Fischer
52c7193ad0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10846] fixing SQL query bug in acp_main.php
2012-05-01 13:38:25 +02:00
Senky
665f38d42f [ticket/10846] fixing SQL query bug in acp_main.php
PHPBB3-10846
2012-04-30 22:01:53 +02:00
Oleg Pudeyev
5b48df4168 [feature/prune-users] Move quote to the correct line.
PHPBB3-9622
2012-04-25 19:41:50 -04:00
Oleg Pudeyev
7d92cccf74 Merge PR #731 branch 'VSEphpbb/ticket/10779' into develop
* VSEphpbb/ticket/10779:
  [ticket/10779] Move jQuery CDN option to Load Settings
2012-04-25 17:52:24 -04:00
Oleg Pudeyev
0f36e15f86 [feature/prune-users] Split one line into two lines for readability.
PHPBB3-9622
2012-04-19 20:37:21 -04:00
Oleg Pudeyev
6151f46abe [feature/prune-users] Fix issues with queries pointed out by bantu.
PHPBB3-9622
2012-04-19 20:35:13 -04:00
Oleg Pudeyev
953e829b52 [feature/prune-users] Non-cosmetic changes per bantu's review.
PHPBB3-9622
2012-04-19 20:35:13 -04:00
Matt Friedman
4176ee1c95 [ticket/10779] Move jQuery CDN option to Load Settings
http://tracker.phpbb.com/browse/PHPBB3-10779

PHPBB3-10779
2012-04-10 15:19:26 -07:00
Rahul R
b0f5db152f [ticket/10650] Removed changes from acp_forums.php
Removed unneccesary changes from acp_forums.php

PHPBB3-10650
2012-04-08 11:12:29 +05:30
Rahul R
c524236ef6 [ticket/10650] Changed acp option from per forum to global
Changed the display last subject acp toggle option from
per forum to global. Modified associated database entries.
New option is available in ACP General->Board Features.
Also corrected <br /> in forumlist_body.html.

PHPBB3-10650
2012-04-08 10:34:44 +05:30
Rahul
bc21dec9c0 [ticket/10650] Corrected space before true
Inserted a space before 'true' as per coding
guidelines.

PHPBB3-10650
2012-04-08 10:33:16 +05:30
Rahul
9b30bd6392 [ticket/10650] Displaying last topic on forum list
The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.

PHPBB3-10650
2012-04-08 10:32:19 +05:30
Oleg Pudeyev
98964a913c [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
The pull request (#654) was merged a little too quickly.

In particular, display_last_subject per-forum option needs consensus.

This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing
changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59.

PHPBB3-10650
2012-04-04 19:23:05 -04:00
Rahul
1dd5b48434 [ticket/10650] Corrected space before true
Inserted a space before 'true' as per coding
guidelines.

PHPBB3-10650
2012-04-05 00:46:01 +05:30
Rahul
f32547c215 [ticket/10650] Displaying last topic on forum list
The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.

PHPBB3-10650
2012-04-05 00:45:26 +05:30
Vjacheslav Trushkin
bb62804407 [ticket/10762] Check for phpbb_version when installing style
Check if phpbb_version exists when installing style. Do not warn users about installing outdated styles yet, that part of acp_styles will be changed in different branch.

PHPBB3-10762
2012-04-04 13:13:12 +03:00
Vjacheslav Trushkin
e27326a57b [ticket/10752] Fixes for acp_styles
Adding form token, changing functions to public/protected, fixing few more errors

PHPBB3-10752
2012-04-03 14:26:38 +03:00
Vjacheslav Trushkin
f739d7acce [ticket/10752] Changing private to protected variables in acp_styles
Changing private to protected variables in acp_styles

PHPBB3-10752
2012-04-03 01:14:14 +03:00
Vjacheslav Trushkin
a46b5480e1 [ticket/10752] More fixes for acp_styles
Fixing return doc blocks, spacing, incorrect sorting function and other minor fixes

PHPBB3-10752
2012-04-03 00:19:16 +03:00
Vjacheslav Trushkin
e558a3cb05 [ticket/10752] Pass-by-reference fix for acp_styles
Fixing pass-by-reference bug in acp_styles

PHPBB3-10752
2012-04-03 00:18:52 +03:00
Vjacheslav Trushkin
7c99525b98 [ticket/10752] Removing globals acp_styles
Removing global variables from functions in acp_styles

PHPBB3-10752
2012-04-03 00:14:30 +03:00
Igor Wiedler
9236dd4c47 [feature/class-prefix] Rename auth => phpbb_auth
PHPBB3-10609
2012-03-31 18:14:11 +02:00
Igor Wiedler
5d07b16ec6 [feature/merging-style-components] Fix back link on install page
When on install page and all styles are installed, fix back link to go to main
styles page.

PHPBB3-10632
2012-03-31 18:20:49 +03:00
Vjacheslav Trushkin
0540509f14 [feature/merging-style-components] Renaming "delete" to "uninstall" for styles
Changing from "delete" to "uninstall" in acp_styles to avoid confusing users

PHPBB3-10632
2012-03-31 17:58:17 +03:00
Vjacheslav Trushkin
9611997552 [feature/merging-style-components] Fixing few errors in acp_styles
Fixing notices and usability issues

PHPBB3-10632
2012-03-31 17:04:17 +03:00
Igor Wiedler
bc46cfd6e5 [feature/merging-style-components] Fix notices in acp_styles
PHPBB3-10632
2012-03-31 16:53:41 +03: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
Igor Wiedler
41d8a777dc [feature/ajax] Add entirely unrelated but nice newlines
PHPBB3-10270
2012-03-31 02:10:18 +02:00
Igor Wiedler
4a5172c9f7 [feature/ajax] Unify phpbb_json_response instantiation
PHPBB3-10270
2012-03-31 02:10:17 +02:00
Igor Wiedler
8138103c6b [feature/ajax] Send correct activate/deactivate JSON response in acp_profile
PHPBB3-10270
2012-03-31 02:10:17 +02:00
Igor Wiedler
9b971c9fb1 [feature/ajax] Replace static call to phpbb_request with OO
PHPBB3-10270
2012-03-31 02:10:17 +02:00
Igor Wiedler
e73426fe26 [feature/ajax] Handle acp_modules error cases with JSON response
PHPBB3-10270
2012-03-31 02:10:15 +02:00
Callum Macrae
e7e09f8da2 [ticket/10272] AJAXified the bots page in the ACP.
PHPBB3-10272
2012-03-31 02:09:15 +02:00
Callum Macrae
4ae74cd4b4 [ticket/10271] AJAXified buttons on acp_main.
PHPBB3-10271
2012-03-31 02:09:15 +02:00
Callum Macrae
1cb3b595ec [ticket/10271] AJAXified the styles tab in the ACP.
PHPBB3-10271
2012-03-31 02:09:15 +02:00
Callum Macrae
11112314f7 [ticket/10271] AJAXified various deletions in the ACP.
The following places have had deletion AJAXified:
* Smilies and icons
* Word censors
* BBCodes
* Attachment groups
* Groups
* Admin / User / Moderator / Forum roles
* Report / denial reasons
* Module management
* Custom profile fields

PHPBB3-10271
2012-03-31 02:09:15 +02:00
Callum Macrae
7a933bdb5a [ticket/10328] Renamed the JSON class, also now using autoloading.
It is no longer static, and uses autoloading. It has also been renamed
from JSON to phpbb_json_response.

PHPBB3-10328
2012-03-31 02:09:14 +02:00
Callum Macrae
dce38f44de [ticket/10328] Added a JSON class.
The JSON class adds a consistent way to send JSON to the client, making
it perfect for AJAX (jQuery automatically parses it).

PHPBB3-10328
2012-03-31 02:09:13 +02:00
Callum Macrae
94172b54dd [ticket/10271] Changed AJAX functions to $request->is_ajax().
PHPBB3-10271
2012-03-31 02:09:13 +02:00