Commit graph

17542 commits

Author SHA1 Message Date
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
erangamapa
df98de971c [ticket/11106] Undefined index EDITED_TIME_TOTAL notice.
When viewing a private message, when message edit count is 1
Undefined index EDITED_TIME_TOTAL php notice appears. Changed
the message formatting method to what is used in viewtopic.php.

PHPBB3-11106
2013-03-12 10:19:29 +05:30
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
Marc Alexander
4ad8fcbd58 [ticket/11404] Remove version ID from manager_test.php file header
PHPBB3-11404
2013-03-11 10:35:18 +01:00
Marc Alexander
fb1984dadb [ticket/11404] Add tests for phpbb_avatar_manager::clean_row()
PHPBB3-11404
2013-03-11 10:34:25 +01:00
Marc Alexander
2ec0dc5b34 [ticket/11404] Convert manager_test to UNIX line endings
PHPBB3-11404
2013-03-11 10:34:12 +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
Nathaniel Guse
6704a82bbe [ticket/11422] Increment assets when database_update is complete
PHPBB3-11422
2013-03-10 13:02:31 -05: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
Nathaniel Guse
3f5d938a95 Merge remote-tracking branch 'remotes/marc/ticket/11323' into develop
# By Marc Alexander
# Via Marc Alexander
* remotes/marc/ticket/11323:
  [ticket/11323] Reduce additional code and revert regex to previous one
  [ticket/11323] Enable tests for inclusion of defined variables
  [ticket/11323] Correctly treat variables in template defines
2013-03-09 19:02:44 -06:00
Nathaniel Guse
48bad80f4a Merge remote-tracking branch 'remotes/Blitze/ticket/11383' into develop
# By OpenShift guest
# Via OpenShift guest
* remotes/Blitze/ticket/11383:
  [ticket/11383] Correctly revert modules added/removed by migrator
2013-03-09 18:33:19 -06:00
David King
606e392d40 Merge remote-tracking branch 'EXreaction/ticket/11423' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11423:
  [ticket/11423] Send unformatted usernames to the email template
2013-03-09 18:38:05 -05:00
Nathaniel Guse
36de18e174 [ticket/11423] Send unformatted usernames to the email template
PHPBB3-11423
2013-03-09 09:12:46 -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
Nathan Guse
0c8c8484d0 Merge remote-tracking branch 'remotes/nickv/ticket/11407' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11407:
  [ticket/11407] Fix <dfn> description of "notification" option.
2013-03-07 11:31:29 -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
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
Marc Alexander
bb58462724 [ticket/11404] Use a default data row if $row is empty in clean_row()
A statically defined $default_row will be used inside the
phpbb_avatar_manager::clean_row() method if the $row passed to it is
empty.

PHPBB3-11404
2013-03-07 13:03:27 +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
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