Commit graph

16204 commits

Author SHA1 Message Date
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
b712cff496 [ticket/9657] Populate data about post's delete status in mcp_post
PHPBB3-9657
2013-03-12 11:36:40 +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
Joas Schilling
f6dd688e72 [ticket/9657] Fix missing global $phpbb_container
PHPBB3-9657
2013-03-11 12:40:33 +01:00
Joas Schilling
cd95d3abf7 [ticket/9657] Include poster name in "deleted post" message
Also switched from passive to active form

PHPBB3-9657
2013-03-11 12:22:47 +01:00
Joas Schilling
8b24ccb894 [ticket/9657] Fix some language problems and inconsistences
PHPBB3-9657
2013-03-11 12:13:59 +01:00
Joas Schilling
4bd5d6c097 [ticket/9657] Remove line with unused variable
PHPBB3-9657
2013-03-11 11:51:11 +01:00
Joas Schilling
d6d7acef04 [ticket/9657] Remove already fixed todo
PHPBB3-9657
2013-03-10 23:48:53 +01:00
Joas Schilling
147c98fa32 [ticket/9657] Fix newly added empty line
PHPBB3-9657
2013-03-10 22:21:38 +01:00
Joas Schilling
cc5ba36a06 [ticket/9657] Cast IDs to integer
PHPBB3-9657
2013-03-10 22:18:37 +01:00
Joas Schilling
7db5eec5d2 [ticket/9657] Correctly increase users post count when approving posts
PHPBB3-9657
2013-03-10 22:15:29 +01:00
Joas Schilling
eb5a6cb006 [ticket/9657] Display reason field, when the user has both delete permissions
PHPBB3-9657
2013-03-10 22:07:38 +01: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
1a49852413 [ticket/9657] Remove unused email variables
PHPBB3-9657
2013-03-07 14:15:14 +01:00
Joas Schilling
0f73036275 [ticket/9657] Explain soft delete permission in ACP
PHPBB3-9657
2013-03-07 14:10:16 +01:00
Joas Schilling
bff6cf40ba [ticket/9657] Fix colum name in migration file
PHPBB3-9657
2013-03-07 14:02:11 +01:00
Joas Schilling
60c0da8b54 [ticket/9657] Remove empty update_data() method from p2 migration
PHPBB3-9657
2013-03-07 13:15:55 +01:00
David King
d658d6640b Merge remote-tracking branch 'EXreaction/ticket/11408' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11408:
  [ticket/11408] user_jabber instead of jabber
2013-03-06 17:01:30 -05:00
Nathan Guse
9ca15267fa Merge remote-tracking branch 'remotes/bantu/ticket/10202' into develop
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/10202:
  [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.
2013-03-06 15:36:15 -06:00
David King
02758cabbc Merge remote-tracking branch 'nickvergessen/ticket/11166' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11166:
  [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-06 12:07:46 -05:00
Nathaniel Guse
3aab72d79b [ticket/11408] user_jabber instead of jabber
PHPBB3-11408
2013-03-06 09:53:41 -06:00
Joas Schilling
74a9ecfd24 [ticket/9657] Fix wrongly added notifications when post is posted softdeleted
The post/topic should not trigger "*_in_queue" notifications if it is
softdeleted, as it is not in the queue then.

PHPBB3-9657
2013-03-06 16:29:50 +01:00
Joas Schilling
1a17a3854f [ticket/9657] Fix unit tests missing global container.
PHPBB3-9657
2013-03-06 16:13:34 +01:00
Joas Schilling
9bddf73d31 [ticket/9657] Add migration files for updating the database
PHPBB3-9657
2013-03-06 13:53:24 +01:00
Joas Schilling
f5482e73fd [ticket/9657] Correctly return to viewtopic page when handling posts
While managing posts from viewtopic.php we should return to that page,
rather then the MCP

PHPBB3-9657
2013-03-06 13:05:33 +01:00
Joas Schilling
164a06c066 [ticket/9657] Fix "Display this post" link if javascript is disabled
PHPBB3-9657
2013-03-06 13:05:33 +01:00
Joas Schilling
d4aae49aa0 [ticket/9657] Move softdelete permission to new post-tab
PHPBB3-9657
2013-03-06 13:05:32 +01:00
Joas Schilling
e1f5e98fbc [ticket/9657] Correctly state when to refresh last/first post info on approving
PHPBB3-9657
2013-03-06 13:05:15 +01:00
Joas Schilling
d0d9005166 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11402] Fix undefined index in post/topic_in_queue
  [ticket/11400] If email is disabled, disable it for notifications
2013-03-06 07:39:17 +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
Andreas Fischer
32ff2348f1 [ticket/10202] Rename method names _all() to _array().
PHPBB3-10202
2013-03-05 23:15:46 +01:00
Andreas Fischer
3a4b34ca32 [ticket/10202] Add migration file for config_db_text.
PHPBB3-10202
2013-03-05 22:59:58 +01:00
Andreas Fischer
5158224845 [ticket/10202] Upgrade TEXT to the bigger MTEXT.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
0071ad3bfd [ticket/10202] Improve method documentation.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
af02681960 [ticket/10202] SQL escape the table name.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
95764c4f0e [ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
722092fe54 [ticket/10202] Define phpbb_config_db_text as a service.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
828c6c01bb [ticket/10202] Add tests for phpbb_config_db_text.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
a73b76cb24 [ticket/10202] Adjust method names to guidelines.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
3a5d3bdd68 [ticket/10202] Add database schema for phpbb_config_db_text.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
50b557ca4e [ticket/10202] Implementation of config options with arbitrary length values.
PHPBB3-10202
2013-03-05 22:59:57 +01:00