mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
20,961 Commits 17 Branches 190 Tags
Commit Graph

20961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Crizzo
df47cbb254 [ticket/12404] Splits up the line 18 in subsilver2 into more lines 
PHPBB3-12404
 2014-04-25 22:15:13 +02:00
Cesar G
0553d79808 Merge remote-tracking branch 'Nicofuma/ticket/12418' into develop-ascraeus 
* Nicofuma/ticket/12418:
  [ticket/12418] Notice displayed for feed.php
 2014-04-25 13:03:23 -07:00
Cesar G
5cc0f50d28 [ticket/11339] Always clear timeout functions on subsequent AJAX calls 
PHPBB3-11339
 2014-04-25 12:10:46 -07:00
Joas Schilling
18be18e998 [ticket/12273] Do not allow 3.1-A1 for template events 
PHPBB3-12273
 2014-04-25 20:26:47 +02:00
Cesar G
fe768d460d Merge remote-tracking branch 'PayBas/ticket/12437' into develop-ascraeus 
* PayBas/ticket/12437:
  [ticket/12437] Clean up redundant "clear" elements & "corners"
 2014-04-25 10:10:32 -07:00
Andreas Fischer
d7c3cf4700 Merge pull request #2288 from nickvergessen/ticket/12012 
[ticket/12012] Correctly drop default value constraints

* nickvergessen/ticket/12012:
  [ticket/12012] Move property to the top
  [ticket/12012] Move MS SQL server comparison into a method
  [ticket/12012] Fix docs in connection manager
  [ticket/12012] Remove duplicated code (only the $sql are different)
  [ticket/12012] Handle begin and commit transactions in tests
  [ticket/12012] Drop and recreate indexes when removing columns
  [ticket/12012] Add a unit test for removing a column with indexes
  [ticket/12012] Add a unit test for changing the column type
  [ticket/12012] Return SQL statements for index drop/create
  [ticket/12012] Fix tools::mssql_get_existing_indexes() for SQL Server 2000
  [ticket/12012] Drop and recreate indexes when changing a column on MSSQL
  [ticket/12012] Fix query layout
  [ticket/12012] Correctly drop default value constraints on MSSQL
 2014-04-25 18:54:40 +02:00
Cesar G
b305ec5611 Merge remote-tracking branch 'PayBas/ticket/12389' into develop-ascraeus 
* PayBas/ticket/12389:
  [ticket/12389] Change "PM" to "Message"
  [ticket/12389] Moved PM tools to UCP template
  [ticket/12389] Replace email and print icons.
  [ticket/12389] Change language of email friend
  [ticket/12389] Move print topic & email topic icons to topic tools
 2014-04-25 07:33:22 -07:00
Cesar G
fefd6b7423 Merge remote-tracking branch 'nickvergessen/ticket/12382' into develop-ascraeus 
* nickvergessen/ticket/12382:
  [ticket/12382] Mark broken nested loop with include as incomplete
  [ticket/12382] Add template test for subloops inside includes
  [ticket/12382] Add template test for subloops inside events
 2014-04-25 07:24:50 -07:00
Andreas Fischer
c61f92eb46 Merge pull request #2352 from nickvergessen/ticket/11917 
[ticket/11917] Replace space with tabs

* nickvergessen/ticket/11917:
  [ticket/11917] Replace space with tabs
 2014-04-25 16:01:26 +02:00
rxu
60d2a3389a [ticket/12403] Add template events to acp_users_prefs.html 
Since it is possible for extensions to add new user preferences to UCP,
it should be also possible to control it via ACP too
just like for build-in user preferences.
Thus, some prepend/append template events are added.

PHPBB3-12403
 2014-04-25 21:46:38 +08:00
PayBas
5109d3a12f [ticket/12442] Add CSS classes to important headings 
PHPBB3-12442
 2014-04-25 12:56:58 +02:00
Joas Schilling
9c689ef8dd [ticket/11917] Replace space with tabs 
PHPBB3-11917
 2014-04-25 12:45:48 +02:00
Joas Schilling
3bcda97e28 [ticket/12273] Sort arguments alphabetically before exporting 
PHPBB3-12273
 2014-04-25 12:37:39 +02:00
Joas Schilling
48278f122c [ticket/12273] Do not allow 3.1-A1 version 
PHPBB3-12273
 2014-04-25 12:31:57 +02:00
Joas Schilling
b32895308d [ticket/12273] Update since version to 3.1.0-a* style 
PHPBB3-12273
 2014-04-25 12:15:44 +02:00
Joas Schilling
7324cb051f [ticket/12371] Fix redirect link for approve_post and post_in_queue 
PHPBB3-12371
 2014-04-25 11:52:29 +02:00
Joas Schilling
40d91a5d6e [ticket/12371] Delete the approve_post notification when editing a post 
We need to delete the initial approve notification,
so we can notify the user again, when his post got reapproved.

PHPBB3-12371
 2014-04-25 11:52:28 +02:00
Joas Schilling
465aa9c346 [ticket/12371] Fix language in comment 
PHPBB3-12371
 2014-04-25 11:52:28 +02:00
Joas Schilling
16329c7ad9 [ticket/12371] Reapprove the post and topic again in tests 
PHPBB3-12371
 2014-04-25 11:52:27 +02:00
Joas Schilling
ddbb521e57 [ticket/12371] Correctly set is_starter when editing first post of the topic 
PHPBB3-12371
 2014-04-25 11:52:26 +02:00
Joas Schilling
793680478b [ticket/12371] Add functional tests for reapproving 
PHPBB3-12371
 2014-04-25 11:52:26 +02:00
Joas Schilling
70f5686efb [ticket/12371] Fix query in mcp_sorting() 
PHPBB3-12371
 2014-04-25 11:52:25 +02:00
Joas Schilling
1d61fcf3c9 [ticket/12371] Rename disapprove and softdelete tests 
PHPBB3-12371
 2014-04-25 11:52:25 +02:00
Joas Schilling
84a77d07be [ticket/12371] We do not group quote notifications anymore 
PHPBB3-12371
 2014-04-25 11:52:23 +02:00
Joas Schilling
8375c3f789 [ticket/12371] Fix SQL query 
PHPBB3-12371
 2014-04-25 11:52:23 +02:00
Joas Schilling
5512e62c3c [ticket/11772] Do not send out new topic/post notifications when reapproving 
Only add notifications, if we are not reapproving post
When the topic was already approved, but was edited and
now needs re-approval, we don't want to notify the users again.

PHPBB3-11772
 2014-04-25 11:52:22 +02:00
Joas Schilling
2ec9c08a2b [ticket/12052] Use different visibility when post was edited 
... and needs to be reapproved.

PHPBB3-12052
 2014-04-25 11:52:22 +02:00
Cesar G
dac01e8ca5 [ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility method 
PHPBB3-12052
 2014-04-25 11:52:21 +02:00
Joas Schilling
37751b51f9 [ticket/12371] Do not add unlimited users as responders 
We run into the risc that the data is longer then the character limit
of the table column. However as we trim the users list anyway, we can
also just stop adding them and display "many others" instead of "x others"

PHPBB3-12371
 2014-04-25 11:52:20 +02:00
Joas Schilling
418747ed34 [ticket/12371] Do not update the notification entry unneccessarily 
When the data did not change, we also don't have to run the query at all.

PHPBB3-12371
 2014-04-25 11:52:20 +02:00
Joas Schilling
92db22c882 [ticket/12371] Do not delete post related notifications when a post is deleted 
When a post is marked edited and therefor marked as softdeleted/unapproved,
we should not delete the notifications, just like we can't delete the emails.
Links are out there anyway and just keeping the notification is fail save.

If we keep the notification we can just continue to update it when more posts
are added. Also when we delete a post, we don't have to go though the table
and find all related notifications to be able to delete them or even update
them, when they have responders set.

PHPBB3-12371
 2014-04-25 11:52:19 +02:00
Joas Schilling
e0fadfb4d6 [ticket/12371] Allow notification types to redirect to a different url 
This way we can redirect the post and bookmark notification to the first
unread post in the topic

PHPBB3-12371
 2014-04-25 11:52:19 +02:00
Joas Schilling
ed40846590 [ticket/12371] Do not group "quote" notifications 
Grouping these notification makes no sense, as the user will not find the
posts he is quoted in, when they are spread over multiple pages

PHPBB3-12371
 2014-04-25 11:52:18 +02:00
Joas Schilling
87899b0e14 [ticket/12273] Update existing events 
PHPBB3-12273
 2014-04-25 11:46:44 +02:00
Joas Schilling
01e2d7c26c [ticket/12273] Fix unit tests for multi line arrays 
PHPBB3-12273
 2014-04-25 11:46:24 +02:00
Joas Schilling
142fe1a0e5 [ticket/12273] Use multiline arrays instead of array_merge() 
PHPBB3-12273
 2014-04-25 11:45:54 +02:00
Joas Schilling
d5ea4906ca [ticket/12012] Move property to the top 
PHPBB3-12012
 2014-04-24 22:57:35 +02:00
PayBas
65c8280fb6 [ticket/12389] Change "PM" to "Message" 
PHPBB3-12389
 2014-04-24 22:09:15 +02:00
Joas Schilling
c2dace762e [ticket/12273] Fix long $vars lines for existing events 
PHPBB3-12273
 2014-04-24 17:26:27 +02:00
Joas Schilling
8599554443 [ticket/12273] Fix unit test for multi line $vars 
PHPBB3-12273
 2014-04-24 17:14:45 +02:00
Joas Schilling
b0a9acd8ff [ticket/12273] Use array_merge instead of += 
PHPBB3-12273
 2014-04-24 17:14:12 +02:00
Joas Schilling
d2ab305909 [ticket/12273] Add missing event documentation 
PHPBB3-12273
 2014-04-24 16:51:43 +02:00
Joas Schilling
320a2f7578 [ticket/12273] Fix number of = in events.md 
PHPBB3-12273
 2014-04-24 16:51:42 +02:00
Joas Schilling
8e4b4bc72e [ticket/12273] Fix subsilver2 missing from simple_footer_after docs 
PHPBB3-12273
 2014-04-24 16:51:42 +02:00
Joas Schilling
a2c3b2534a [ticket/12273] Fix method name of test and fix undefined index 
PHPBB3-12273
 2014-04-24 16:51:41 +02:00
Joas Schilling
5889255529 [ticket/12273] Test source files and compare with events.md 
PHPBB3-12273
 2014-04-24 16:51:40 +02:00
Joas Schilling
7dc32a45e5 [ticket/12273] Verify the result of the .md file to the source 
PHPBB3-12273
 2014-04-24 16:51:40 +02:00
Joas Schilling
f676f50c22 [ticket/12273] Only check selected files 
PHPBB3-12273
 2014-04-24 16:51:39 +02:00
Joas Schilling
23dbddc59d [ticket/12273] Fix some locations of existing events 
PHPBB3-12273
 2014-04-24 16:51:38 +02:00
Joas Schilling
c7dcc6d700 [ticket/12273] Verify that the events are still in the named files 
PHPBB3-12273
 2014-04-24 16:51:37 +02:00