mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-13 11:06:03 +02:00
Code Issues Releases Wiki Activity
14,448 Commits 18 Branches 192 Tags
Commit Graph

1110 Commits

Author SHA1 Message Date
Nathan Guse
94d682f774 [ticket/11103] Use the full class name as the item_type/method 
This is going to require you recreate the db tables.

PHPBB3-11103
 2012-10-20 20:58:53 -05:00
Nathan Guse
ae670cc87d [ticket/11103] Remove unnecessary comments 
Comments that are not needed because the actions are completely
self-explanatory

PHPBB3-11103
 2012-10-18 18:32:13 -05:00
Nathan Guse
3f27890a5e Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 
Conflicts:
	phpBB/includes/functions.php
 2012-10-18 18:23:22 -05:00
Andreas Fischer
b3fdf8a046 Merge remote-tracking branch 'EXreaction/ticket/8796' into develop 
* EXreaction/ticket/8796:
  [ticket/8796] Prevent setting post_time greater than time() in markread
  [ticket/8796] Fix a few issues with the previous commits
  [ticket/8796] Mark read links updated to include time() in url
  [ticket/8796] Revert changes to $user->data['lastmark']
  [ticket/8796] Make function markread obey the $post_time argument
 2012-10-18 16:43:46 +02:00
Andreas Fischer
4f3f4a40d6 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10848] Move include up.
  [ticket/10848] Add phpbb_ prefix.
  [ticket/10848] Redirect from adm to installer correctly.

Conflicts:
	phpBB/includes/functions.php
 2012-10-18 16:34:59 +02:00
Oleg Pudeyev
bb09cd9c8e [ticket/10848] Add phpbb_ prefix. 
PHPBB3-10848
 2012-10-17 15:13:35 -04:00
Oleg Pudeyev
c630480ca1 [ticket/10848] Redirect from adm to installer correctly. 
PHPBB3-10848
 2012-10-17 15:08:09 -04:00
Nathan Guse
61a1467c90 [ticket/11103] U_VIEW_ALL_NOTIFICATIONS Link 
PHPBB3-11103
 2012-10-16 16:47:18 -05:00
Nathan Guse
94a3dc5ff7 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-10-12 17:09:12 -05:00
Oleg Pudeyev
cc5923ea43 Merge PR #993 branch 'bantu/ticket/8713' into develop 
* bantu/ticket/8713:
  [ticket/8713] Update untrimmed_variable() doc block.
  [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.
  [ticket/8713] Trim password in auth_db to keep compatibility.
  [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.
  [ticket/8713] Rename untrimed_variable() to untrimmed_variable().
  [ticket/8713] DRY: variable() and untrimed_variable() into a protected method.
  [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc.
  [ticket/8713] Always trim array keys.
  [ticket/8713] Add simple (non-nested) test case for untrimmed set_var().
  [ticket/8713] Use \t in double quotes instead of tabs.
  [ticket/8713] Use correct parameter for nested data.
  [ticket/8713] Adjust test method name to other recursive_set_var() tests.
  [ticket/8713] Do not trim login inputs
 2012-10-10 00:03:13 -04:00
Nathan Guse
0bab8ff777 [ticket/11103] ACP option to enable/disable notifications output in header 
PHPBB3-11103
 2012-10-05 13:43:03 -05:00
Nathan Guse
b9bc65eed8 [ticket/11103] Make $phpbb_notifications a global and use it everywhere 
Do not use phpbb_container everywhere (makes testing difficult)

PHPBB3-11103
 2012-10-04 14:47:13 -05:00
Nathan Guse
07fb66ac10 [ticket/11103] Do not abbreviate template output 
PHPBB3-11103
 2012-10-04 14:31:00 -05:00
Nathan Guse
1aa5c005cb Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-10-04 13:30:40 -05:00
Andreas Fischer
fca0811943 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11112] updating links to phpbb.com to use SSL

Conflicts:
	phpBB/adm/index.php
 2012-10-02 17:03:06 +02:00
Senky
1f89fc9cb6 [ticket/11112] updating links to phpbb.com to use SSL 
PHPBB3-11112
 2012-10-01 15:38:16 +02:00
Nathan Guse
51862f151d [ticket/8796] Prevent setting post_time greater than time() in markread 
PHPBB3-8796
 2012-09-30 10:29:43 -05:00
Nathan Guse
48ccc9eb93 [ticket/11103] UCP Notification Options can now be set 
PHPBB3-11103
 2012-09-27 18:25:37 -05:00
Nathaniel Guse
98731b1277 [ticket/11103] Prettify the output for prosilver. 
Create a way to mark items read from the output list.

PHPBB3-11103
 2012-09-20 10:36:11 -05:00
Nathan Guse
05b573ebf7 [ticket/11103] Topic and post dis/approval notifications 
Remove the formatted title function, plaintext is not needed since
email templates are used

Fix a number of bugs.

PHPBB3-11103
 2012-09-15 13:51:02 -05:00
Nathan Guse
fc6457140c Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-09-15 12:00:21 -05:00
Andreas Fischer
9a92c45ad3 Merge remote-tracking branch 'EXreaction/ticket/11021' into develop 
* EXreaction/ticket/11021:
  [ticket/11021] Fix the language changes that were lost previously
 2012-09-15 18:31:13 +02:00
Nathan Guse
9e5505933a [ticket/11021] Fix the language changes that were lost previously 
Change U_HOME to U_SITE_HOME

PHPBB3-11021
 2012-09-15 11:28:58 -05:00
Andreas Fischer
5dc7aba18f Merge remote-tracking branch 'EXreaction/ticket/11021' into develop 
* EXreaction/ticket/11021:
  [ticket/11021] Remove unnecessary line spacing in functions.php
  [ticket/11021] Use L_SITE_HOME instead of L_HOME
  [ticket/11021] Better language strings for site home url/text
  [ticket/11021] subsilver2 support
  [ticket/11021] Add the option to specify a Site home URL and text
 2012-09-15 17:48:51 +02:00
Nathan Guse
480e3daede [ticket/11021] Remove unnecessary line spacing in functions.php 
PHPBB3-11021
 2012-09-15 10:46:03 -05:00
Nathan Guse
7a47013994 [ticket/11021] Use L_SITE_HOME instead of L_HOME 
Check site home url against !== '', not empty

PHPBB3-11021
 2012-09-15 10:44:18 -05:00
Nathan Guse
0c56bd45ef [ticket/11021] Better language strings for site home url/text 
Correct the logo title to be {L_HOME} if {U_HOME} is used.

Check if the Home text is instead of just equal to false when
outputting it to the template

PHPBB3-11021
 2012-09-15 10:28:37 -05:00
Nathan Guse
7589a3093d [ticket/11103] Display all unread notifications by default 
Add unread count to the page title

PHPBB3-11103
 2012-09-14 18:30:12 -05:00
Nathan Guse
8e977544fb [ticket/11103] Normalization of $phpbb_notifications variable name 
Use $phpbb_notifications instead of $notifications everywhere for
consistency and conflict prevention.

PHPBB3-11103
 2012-09-14 17:01:08 -05:00
Nathan Guse
ed1ec8e720 [ticket/11103] Add/Update/Mark Read functions accept an array for the type 
This saves a lot of code in some areas (where the same data is sent, just
for different types)

Notifications for bookmarks

PHPBB3-11103
 2012-09-14 16:54:20 -05:00
Nathan Guse
f083c6d776 [ticket/11103] Mark all post/quote notifications read when marking topics 
Mark forum read marks all topics read, so do so properly for notifications

PHPBB3-11103
 2012-09-14 16:15:15 -05:00
Nathan Guse
fb0ed78c8f [ticket/11103] Store the item's parent id for marking things read 
Mark topics/posts read from the markread() function.

Identify unread items by a grey background in the header (for now)

PHPBB3-11103
 2012-09-14 15:59:13 -05:00
Nathan Guse
5502f3c4aa [ticket/11103] Restyle the notification list 
Very rough (lots of inline CSS, very ugly)

PHPBB3-11103
 2012-09-09 17:20:39 -05:00
Nathan Guse
e45fb0025e [ticket/11103] Output the notifications to the template 
For now, just dumping the notifications in the header.

PHPBB3-11103
 2012-09-08 12:05:55 -05:00
Andreas Fischer
f2607fc9e8 [ticket/8713] Rename untrimed_variable() to untrimmed_variable(). 
PHPBB3-8713
 2012-09-08 14:15:56 +02:00
Nathaniel Guse
fccbf09e4a [ticket/8796] Fix a few issues with the previous commits 
Fix an SQL error and the redirect url generated

PHPBB3-8796
 2012-09-03 18:58:38 -05:00
Nathaniel Guse
b9308329cf [ticket/8796] Revert changes to $user->data['lastmark'] 
The earlier change might change the way some things work
(after looking at viewtopic) and I'd rather not risk introducing
new bugs, so I'm going to revert those changes to be safe.

PHPBB3-8796
 2012-09-03 18:37:54 -05:00
Nathaniel Guse
815cc4a9a3 [ticket/8796] Make function markread obey the $post_time argument 
Also do a little cleanup of the markread function

PHPBB3-8796
 2012-09-03 18:23:36 -05:00
Nathaniel Guse
b3cd5a649b [ticket/8713] Do not trim login inputs 
Create a function to request variables which are not trimmed.

All requests for passwords (except forum passwords) now use the
untrimmed request function.

PHPBB3-8713
 2012-09-03 13:32:33 -05:00
Nils Adermann
43190ebeca Merge pull request #962 from imkingdavid/feature/add_events 
Feature/add events
 2012-09-01 12:44:23 -07:00
Nils Adermann
4fde4abe55 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [task/functional] Fixed DEBUG_TEST related issues
  [task/functional] Allow tests to bypass certain restrictions with DEBUG_TEST
  [task/functional] Added posting tests (reply and new topic)
 2012-09-01 17:06:59 +02:00
David King
7dfe26dd78 [task/functional] Allow tests to bypass certain restrictions with DEBUG_TEST 
PHPBB3-10758
 2012-09-01 10:37:44 -04:00
David King
6c6b179dd4 [feature/add_events] Rename override to overwrite, made docs 79 chars/line 
PHPBB3-9550
 2012-08-21 11:25:52 -04:00
David King
0ba755f1bd [feature/add_events] Rename core.append_sid_override to just core.append_sid 
Also, I added the hook back in below the event for backwards compatibility.

PHPBB3-9550
 2012-08-20 20:45:09 -04:00
David King
808af65819 [feature/add_events] Globalize the event dispatcher object 
PHPBB3-9550
 2012-08-20 12:01:08 -04:00
David King
abc0ee753d [feature/add_events] Return the correct variable 
PHPBB3-9550
 2012-08-20 11:57:43 -04:00
David King
fbdc956a1c [feature/add_events] Replaced current append_sid() hook with new event 
The new event, core.append_sid_override can either supplement or override
the append_sid() function.

PHPBB3-9550
 2012-08-20 11:52:06 -04:00
Joas Schilling
93912a2649 [feature/php-events] Remove double space in comments 
PHPBB3-9550
 2012-08-05 23:11:36 +02:00
Joas Schilling
e926ec9934 [feature/php-events] Add docs for core.garbage_collection 
PHPBB3-9550
 2012-08-05 16:51:51 +02:00
Joas Schilling
997075a008 [feature/php-events] Add docs for core.page_footer 
PHPBB3-9550
 2012-08-05 16:46:57 +02:00