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

2119 Commits

Author SHA1 Message Date
asperous
0f41cc34dd [ticket/11129] Added headers to empty subscription state
Added a newline to better seperate the two headers.

PHPBB3-11129
2013-04-23 15:02:38 -07:00
asperous
51a869b13a [ticket/11129] Added headers to empty subscription state
"You are not subscribed to any forums".
While correct, could lead to confusion. What's missing is a header right above the message that says "Watched Topics" to match the "Watched Forums" header above. This will assert the idea that there are two separate watchable sections.
As is, it looks like that message is talking about the "Watched Forums" section, since it's listed under that header.

PHPBB3-11129
2013-04-23 11:27:36 -07:00
Andreas Fischer
ec33bada93 Merge remote-tracking branch 'hjpotter92/ticket/11225' into develop
* hjpotter92/ticket/11225:
  [ticket/11225] Deletion of unused mcp_jumpbox.html file
2013-04-13 00:23:22 -04:00
Vjacheslav Trushkin
67f0e19128 [ticket/10741] Do not resize textarea.no-auto-resize
Do not auto-resize textareas with class .no-auto-resize

PHPBB3-10741
2013-04-12 16:46:54 +03:00
Vjacheslav Trushkin
316efcbbbb [ticket/10741] Automatically resize textareas in prosilver and ACP
Automatically resize textareas in prosilver and ACP.

PHPBB3-10741
2013-04-12 16:46:54 +03:00
Vjacheslav Trushkin
2387e7eb41 [ticket/11275] Do not use spacer.gif in color picker
PHPBB3-11275
2013-04-12 16:42:36 +03:00
Vjacheslav Trushkin
fafbce8124 [ticket/11275] Do not use document.write() for color palette
Replace document.write() for color palette function

PHPBB3-11275
2013-04-12 16:40:32 +03:00
Nils Adermann
c25dfef770 Merge pull request #1184 from marc1706/ticket/11314
[ticket/11314] Improve readability and code cleanup in new JavaScript files
2013-04-12 06:32:13 -07:00
Vjacheslav Trushkin
f89b80e183 [ticket/4412] Shorten long profile fields
Shorten long profile fields using CSS

PHPBB3-4412
2013-04-11 14:31:17 +03:00
hjpotter92
effc8a9bd0 [ticket/11225] Deletion of unused mcp_jumpbox.html file
The file/template is no longer used(as mentioned in it).

PHPBB3-11225
2013-04-11 00:00:48 +05:30
Nils Adermann
52a0f32d99 Merge pull request #1312 from VSEphpbb/ticket/11463
[ticket/11463] Add title attribute to topics in search results
2013-04-04 01:39:37 -07:00
Marc Alexander
34cdbd0360 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314
Conflicts:
	phpBB/styles/prosilver/template/timezone.js
2013-03-26 13:18:54 +01:00
Marc Alexander
f0b0978538 [ticket/11314] Modify files to comply with coding standards
PHPBB3-11314
2013-03-26 13:13:33 +01:00
Marc Alexander
36168b311e [ticket/11314] Fix issues mentioned in jshint report
Additionally, the editor.js files are now the same file in both
subsilver2, prosilver, and the acp.

PHPBB3-11314
2013-03-26 10:31:28 +01:00
Matt Friedman
940d16b585 [ticket/11463] Add title attribute to topics in search results
We use this title attribute in viewforum_body.html, but not in
search_results.html. Perhaps we should, as this will maintain
consitency between all these topic view pages.

PHPBB3-11463
2013-03-20 11:39:06 -07:00
Matt Friedman
433fbfd4d9 [ticket/11461] Add template event in the footer of view topic pages
PHPBB3-11461
2013-03-19 13:32:17 -07:00
Marc Alexander
d378f5ac32 [ticket/11433] Rename CSS class "jalert" to "phpbb_alert"
This missing change caused the loading info to appear during ajax
requests. With this patch it will be properly hidden as it should.

PHPBB3-11433
2013-03-12 15:15:21 +01:00
Joas Schilling
759086e654 [ticket/9657] Remove AJAX from delete button and approval/restore form
When a post is being deleted and the user goes to the next page, the first
post of that next page is now on the page before. So the user performing
the action will skip the post. Until we found a good solution to fix this,
we just remove the AJAX from these features.
For more information see http://tracker.phpbb.com/browse/PHPBB3-11340

PHPBB3-9657
2013-03-12 11:45:36 +01:00
Joas Schilling
d9e9490366 [ticket/9657] Add note about post being soft deleted in subsilver2
PHPBB3-9657
2013-03-12 11:39:16 +01:00
Joas Schilling
db12214279 [ticket/9657] Fix typo in subsilver2 condition
PHPBB3-9657
2013-03-12 11:38:23 +01:00
Joas Schilling
d44a0a17df [ticket/9657] Provide option to restore post in mcp_post
PHPBB3-9657
2013-03-12 11:37:36 +01:00
Joas Schilling
a67daa8c8a [ticket/9657] Fix some more subsilver2
PHPBB3-9657
2013-03-12 11:10:44 +01:00
Joas Schilling
74b731f0f7 [ticket/9657] Fix some minor issues in prosilver
PHPBB3-9657
2013-03-12 11:09:34 +01:00
Joas Schilling
5da250148b [ticket/9657] Finish subsilver2 viewforum and viewtopic
PHPBB3-9657
2013-03-12 09:14:39 +01:00
Joas Schilling
1970ee9854 [ticket/9657] Fix softdelete for subsilver2 - part1
PHPBB3-9657
2013-03-11 23:28:39 +01:00
Joas Schilling
4e9cf27394 [ticket/9657] Remove softdelete reason field when permanent delete is selected
PHPBB3-9657
2013-03-11 23:08:40 +01:00
Joas Schilling
b727e1eeda [ticket/9657] Correctly split disapproving from perma deleting posts
PHPBB3-9657
2013-03-11 16:37:43 +01:00
Nathaniel Guse
d6930df7a2 Merge remote-tracking branch 'remotes/dhruv/ticket/11303' into develop
# By Dhruv
# Via Dhruv
* remotes/dhruv/ticket/11303:
  [ticket/11303] rename attribute to timezone-preselect
  [ticket/11303] remove additional brackets
  [ticket/11303] use S_TZ_PRESELECT in subsilver
  [ticket/11303] add S_TZ_PRESELECT template var
2013-03-09 19:08:51 -06:00
Nathan Guse
7bb32d27ac Merge remote-tracking branch 'remotes/nickv/ticket/11421' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11421:
  [ticket/11421] Correctly display submit button when needed
2013-03-07 11:33:33 -06:00
Nathan Guse
683e17c403 Merge remote-tracking branch 'remotes/nickv/ticket/11417' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11417:
  [ticket/11417] FIx submit button description on notifications options page
2013-03-07 11:33:02 -06:00
Nathan Guse
e826edb6fe Merge remote-tracking branch 'remotes/nickv/ticket/11390' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11390:
  [ticket/11390] Correctly separate list of notifications from header
  [ticket/11390] Hide pagination when there are no notifications
2013-03-07 11:32:17 -06:00
Joas Schilling
692e0f1e33 [ticket/9657] Adapt confirm box templates to new layout
PHPBB3-9657
2013-03-07 16:17:04 +01:00
Joas Schilling
20f84c3795 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11408] user_jabber instead of jabber
  [ticket/10202] Rename method names _all() to _array().
  [ticket/10202] Add migration file for config_db_text.
  [ticket/10202] Upgrade TEXT to the bigger MTEXT.
  [ticket/10202] Improve method documentation.
  [ticket/10202] SQL escape the table name.
  [ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries.
  [ticket/10202] Define phpbb_config_db_text as a service.
  [ticket/10202] Add tests for phpbb_config_db_text.
  [ticket/10202] Adjust method names to guidelines.
  [ticket/10202] Add database schema for phpbb_config_db_text.
  [ticket/10202] Implementation of config options with arbitrary length values.
  [ticket/11166] Add ajaxify support to normal ACP confirm_box()
  [ticket/11166] Fix several custom confirm templates in prosilver
  [ticket/11166] Add caption to AJAX confirm box default template
  [ticket/11166] Fix typo in comment
  [ticket/11166] Use provided custom templates on AJAX confirm box
2013-03-07 16:09:55 +01:00
Joas Schilling
d219eafa16 [ticket/11407] Fix <dfn> description of "notification" option.
PHPBB3-11407
2013-03-07 12:18:53 +01:00
Joas Schilling
7ac945358e [ticket/11390] Correctly separate list of notifications from header
PHPBB3-11390
2013-03-07 11:39:55 +01:00
Joas Schilling
899d857929 [ticket/11390] Hide pagination when there are no notifications
PHPBB3-11390
2013-03-07 11:39:33 +01:00
Joas Schilling
2caf7fbf12 [ticket/11417] FIx submit button description on notifications options page
PHPBB3-11417
2013-03-07 11:30:02 +01:00
Joas Schilling
300a42f5b8 [ticket/11421] Correctly display submit button when needed
PHPBB3-11421
2013-03-07 11:14:01 +01:00
Joas Schilling
0bbde4c122 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11166
* 'develop' of https://github.com/phpbb/phpbb3: (799 commits)
  [ticket/11402] Fix undefined index in post/topic_in_queue
  [ticket/11400] If email is disabled, disable it for notifications
  [ticket/11398] Correctly call permission_set method in permission tool
  [ticket/11394] Relax Migration Tools
  [ticket/11386] Fix missing ;
  [ticket/10714] Get log from container in install, update and download/file
  [feature/avatars] Update module_auth of ucp module and fix small issues
  [ticket/11396] Rename insert_migration to set_migration_state
  [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
  [ticket/11393] Give more information on database updater
  [ticket/11386] Send list of migrations instead of using load_migrations
  [feature/avatars] Add migrations data file for avatars
  [feature/avatars] Reduce module auth of ucp avatar settings
  [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/
  [ticket/10714] Logs are disabled for this page call only
  [ticket/6723] Show info that message has been deleted before delivery
  [ticket/11385] Fix issue with migration module tool not getting extension module info
  [ticket/11386] Fix failing tests from constructor changes
  [ticket/11386] Fix circular reference error & serialize error
  [ticket/11386] Remove tests that check if finder cache is working
  ...

Conflicts:
	phpBB/assets/javascript/core.js
2013-03-06 07:35:47 +01:00
Joas Schilling
923c0709db Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3: (234 commits)
  [ticket/11398] Correctly call permission_set method in permission tool
  [ticket/11394] Relax Migration Tools
  [ticket/11386] Fix missing ;
  [ticket/10714] Get log from container in install, update and download/file
  [feature/avatars] Update module_auth of ucp module and fix small issues
  [ticket/11396] Rename insert_migration to set_migration_state
  [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
  [ticket/11393] Give more information on database updater
  [ticket/11386] Send list of migrations instead of using load_migrations
  [feature/avatars] Add migrations data file for avatars
  [feature/avatars] Reduce module auth of ucp avatar settings
  [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/
  [ticket/10714] Logs are disabled for this page call only
  [ticket/10411] Fix call to function on non-object $db->...()
  [ticket/10411] Remove ajax delete, so the page is refreshed
  [feature/avatars] Auto-clear avatar dimensions when first changing avatars
  [ticket/10411] Update schema file with new table and remove the column
  [ticket/10411] Add unit tests for move() with values >1
  [ticket/10411] Add migrations file for teampage table
  [ticket/10411] Revert database_update.php changes from for easier update
  ...
2013-03-05 18:26:01 +01:00
Marc Alexander
d26ad8ed26 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
	phpBB/install/database_update.php
2013-03-04 00:22:15 +01:00
Joas Schilling
42c062cedf Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3: (480 commits)
  [ticket/6723] Show info that message has been deleted before delivery
  [ticket/11385] Fix issue with migration module tool not getting extension module info
  [ticket/11386] Fix failing tests from constructor changes
  [ticket/11386] Fix circular reference error & serialize error
  [ticket/11386] Remove tests that check if finder cache is working
  [ticket/11386] Forgot to get the migration classes
  [ticket/11386] Update tests with new constructors for ext.manager/migrator
  [ticket/11386] Use finder to find migration files
  [ticket/11363] Fix to make get_module_infos get from all extensions
  [ticket/11381] Make finder able to search in all available extensions
  [ticket/11103] Revert whitespace changes
  [ticket/11103] Few more minor language things
  [ticket/11103] Don't call generate_board_url many times
  [ticket/11103] Case time in queries as an int
  [ticket/11103] Fix effectively installed check
  [ticket/11103] Remove padding from notifications for now.
  [ticket/11363] Fix a couple bugs and throw errors if the file not found
  [ticket/11372] Migrator should only check if effectively installed if not
  [ticket/11363] Load module info files for extensions too
  [ticket/11103] Notifications Migration file
  ...

Conflicts:
	phpBB/includes/functions_posting.php
	phpBB/includes/mcp/mcp_queue.php
	phpBB/includes/search/fulltext_mysql.php
	phpBB/includes/search/fulltext_native.php
	phpBB/includes/search/fulltext_postgres.php
	phpBB/includes/search/fulltext_sphinx.php
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ajax.js
2013-03-03 20:06:52 +01:00
Joas Schilling
3c5eb8bcad [ticket/11166] Fix several custom confirm templates in prosilver
PHPBB3-11166
2013-03-03 17:23:06 +01:00
Nathaniel Guse
bee4f8d818 Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
# By Marc Alexander
# Via Marc Alexander (1) and Nathaniel Guse (1)
* remotes/upstream/develop-olympus:
  [ticket/6723] Show info that message has been deleted before delivery
2013-03-02 17:50:31 -06:00
Nathaniel Guse
fb371d6bbe Merge remote-tracking branch 'remotes/marc/ticket/6723' into develop-olympus
# By Marc Alexander
# Via Marc Alexander
* remotes/marc/ticket/6723:
  [ticket/6723] Show info that message has been deleted before delivery
2013-03-02 17:48:56 -06:00
Nathaniel Guse
e33c8e2bb6 Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Nathaniel Guse (1)
* remotes/upstream/develop-olympus:
  [ticket/11368] Fix background color for PM report rows by using accessing var.
2013-03-02 17:45:18 -06:00
Marc Alexander
acabe6f5ca [ticket/6723] Show info that message has been deleted before delivery
If the message has been deleted before the delivery it will still show in
the message history, although with an empty message. This patch will
change that behavior to showing the info that it has been deleted before
it was delivered in red letters. The red letters ensure that users won't
mistake the info for the actual message.

PHPBB3-6723
2013-03-03 00:32:31 +01:00
Nathan Guse
ecb9f44bf1 [ticket/11103] Revert whitespace changes
PHPBB3-11103
2013-02-28 17:50:24 -06:00
Marc Alexander
8a9e1ca3f1 [feature/avatars] Auto-clear avatar dimensions when first changing avatars
In the remote avatar and gravatar the dimension input boxes will now be
cleared when changing the avatar. This will only happen once per
page-load. Any input after the first change will not trigger this.

PHPBB3-10018
2013-02-28 22:56:01 +01:00
Nathan Guse
e5417ec123 Merge remote-tracking branch 'remotes/VSE/ticket/11103-VSEphpbb' into ticket/11103
# By Matt Friedman
# Via Matt Friedman
* remotes/VSE/ticket/11103-VSEphpbb:
  [ticket/11103] Remove padding from notifications for now.
  [ticket/11103] Add newlines to bottom of css file
  [ticket/11103] HTML encode double arrow character
  [ticket/11103] Update styling of UCP Notifications in subsilver2
  [ticket/11103] Update styling of UCP Notifications in prosilver
  [ticket/11103] Update styling of subsilver2 notification modal
  [ticket/11103] Update styling of prosilver notification modal
  [ticket/11103] Remove title attribute from notification link
2013-02-28 09:56:37 -06:00