0042f07147
Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
...
Conflicts:
phpBB/install/database_update.php
phpBB/styles/prosilver/template/ucp_prefs_personal.html
phpBB/styles/subsilver2/template/ucp_prefs_personal.html
2012-12-07 21:14:39 -06:00
4103c99a86
[ticket/10679] Add new permission for changing profile field information
...
The setting is copied from "Can use signature"
PHPBB3-10679
2012-12-06 15:10:29 +01:00
b67f112e03
[ticket/10091] Bump minimum supported postgresql version to 8.3.
...
PHPBB3-10091
2012-12-04 02:52:18 -05:00
1823674514
Merge PR #1065 branch 'dhruvgoel92/ticket/10771' into develop
...
* dhruvgoel92/ticket/10771:
[ticket/10771] fix remember me language
[ticket/10771] use remember me in ucp
[ticket/10771] use remember me in acp
[ticket/10771] changed value in help_faq.php
[ticket/10771] Using Remember Me instead of autologin or persistent keys
2012-12-02 11:47:15 -05:00
37f2841af2
[ticket/10771] fix remember me language
...
PHPBB3-10771
2012-12-02 15:40:25 +05:30
619e15378d
[ticket/10771] use remember me in ucp
...
PHPBB3-10771
2012-12-02 14:51:31 +05:30
a97401a180
[ticket/10771] use remember me in acp
...
PHPBB3-10771
2012-12-02 14:51:29 +05:30
a17c1a29f8
[ticket/10771] changed value in help_faq.php
...
PHPBB3-10771
2012-12-02 14:51:28 +05:30
dacacbbd52
[ticket/10771] Using Remember Me instead of autologin or persistent keys
...
Changed language variable LOG_ME_IN's value to
"Remember me"
PHPBB3-10771
2012-12-02 14:51:27 +05:30
61aa53f91a
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
...
Conflicts:
phpBB/config/services.yml
phpBB/index.php
2012-11-20 23:19:51 -06:00
2f50d65648
[feature/controller] Remove unused language strings
...
PHPBB3-10864
2012-11-18 15:51:32 -05:00
60c0a1dd2a
[feature/controller] Don't use $user->lang() before container compilation
...
PHPBB3-10864
2012-11-18 15:51:05 -05:00
5c86a1660d
[feature/controller] Don't allow a kernel listener to be added with no method
...
PHPBB3-10864
2012-11-16 16:25:12 -05:00
06158693c7
[feature/controller] Implement a front controller
...
PHPBB3-10864
2012-11-16 16:25:09 -05:00
1a2dfa6d4c
Merge PR #1074 branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11192] Merge dataProvider arrays because the test is the same now.
[ticket/11192] Update $value parameter description to support other types.
[ticket/11192] Mark negative byte numbers as unsupported.
[ticket/11192] Test strings not converted to int/float before.
[ticket/11192] Also test strings, e.g. sums returned by the database.
[ticket/11192] Also test powers of 10 / 1000.
[ticket/11192] Add tests.
[ticket/11192] Add Tebibyte to get_formatted_filesize().
2012-11-16 10:29:22 -05:00
985d234a29
[ticket/11103] Move all email templates to the email/ directory & prep short
...
Prepare short email templates (to be used in jabber)
PHPBB3-11103
2012-11-11 11:37:14 -06:00
c699b88bc5
[ticket/11192] Add Tebibyte to get_formatted_filesize().
...
PHPBB3-11192
2012-11-11 14:35:31 +01:00
68363e362d
Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
...
Conflicts:
phpBB/install/schemas/mssql_schema.sql
phpBB/report.php
phpBB/styles/prosilver/template/ucp_prefs_personal.html
phpBB/styles/subsilver2/template/ucp_prefs_personal.html
2012-11-10 10:58:44 -06:00
6e7e70a18a
[ticket/10780] Replace colon usage in template output with {L_COLON}
...
Replace all the instances (I could find) where the colon is displayed
to the user with {L_COLON} so it can be localised.
PHPBB3-10780
2012-11-10 00:23:03 +01:00
7d7dc98b10
[ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
...
PHPBB3-11181
2012-11-09 23:16:42 +01:00
f09ee16252
[ticket/11103] Use phpBB Container to load types/methods
...
PHPBB3-11103
2012-11-09 07:40:08 -06:00
87ea50948e
Merge remote-tracking branch 'upstream/develop' into feature/prune-users
...
* upstream/develop: (2171 commits)
[ticket/11164] Update composer.phar
[ticket/10933] Use inheritDoc, eliminate copy pasted docblocks.
[ticket/10933] Dependency inject template context.
[ticket/10933] Expanded prose documentation for phpbb_extension_provider.
[ticket/10933] Specify empty template path for absolute includephp test.
[ticket/10933] Useful documentation for template locate function
[ticket/10933] Typo fixes
[ticket/10933] Initialize template context when template is constructed.
[ticket/11099] Mark acp_ban::display_ban_options() as static.
[ticket/11158] Require acl_u_sig for ucp signature module.
[ticket/11158] Revert old fix in PHPBB3-10186.
[ticket/11159] static public is the currently approved order.
[ticket/11157] static public is the currently approved order.
[ticket/11157] Fix remaining captcha spam.
[ticket/11157] get_captcha_types is an instance method.
[ticket/11156] Delete "Misc" tab of forum based permissions + move items
[ticket/10848] Move include up.
[ticket/11014] Fix old pagination assignment
[ticket/11018] Fix several paginations in ACP
[ticket/11014] Fix IF statements for new template pagination
...
Conflicts:
phpBB/includes/functions_user.php
2012-11-06 11:11:27 -05:00
a9b59bfe03
[ticket/11156] Delete "Misc" tab of forum based permissions + move items
...
PHPBB3-11156
2012-10-29 08:01:16 -04:00
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
6861af22ee
[ticket/11103] Message of no notifications if you have none
...
PHPBB3-11103
2012-10-20 19:19:26 -05:00
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
0a260f80af
Merge PR #918 branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
2012-10-17 22:31:35 -04:00
bd44088757
Merge PR #918 branch 'Senky/ticket/10568' into develop-olympus
...
* Senky/ticket/10568:
[ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
2012-10-17 22:10:49 -04:00
4b3264d9bb
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
...
Conflicts:
phpBB/includes/functions_posting.php
phpBB/language/en/email/forum_notify.txt
phpBB/language/en/email/newtopic_notify.txt
phpBB/language/en/email/topic_notify.txt
2012-10-16 23:33:57 -05:00
d5325e6934
Merge PR #624 branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/8743] Include poster´s name in mail notifications
2012-10-16 21:21:03 -04:00
f0544c884f
Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympus
...
* nickvergessen/ticket/8743:
[ticket/8743] Include poster´s name in mail notifications
2012-10-16 21:20:58 -04:00
61a1467c90
[ticket/11103] U_VIEW_ALL_NOTIFICATIONS Link
...
PHPBB3-11103
2012-10-16 16:47:18 -05:00
31502cdd6c
[ticket/11103] Fix comma usage
...
https://github.com/phpbb/phpbb3/pull/992#discussion_r1837084
PHPBB3-11103
2012-10-14 12:45:04 -05:00
a48f090338
[ticket/11103] Make sure notifications are marked read when clicking them
...
How do we do this? If an item is unread, the URL to view that item will
be the URL to mark it as read (index.php?mark_notification=$id). When the
URL is visited it marks the item as read and redirects them to the correct
URL for the item.
If the item is read, the URL is directly to the item.
Prettify the html output
PHPBB-11103
2012-10-14 12:35:35 -05:00
716635c834
[ticket/11103] Fix some language strings
...
Newlines at end of email files
PHPBB3-11103
2012-10-14 10:58:23 -05:00
c5f280351a
[ticket/11103] UCP Notification option grouping
...
Also add the ability to specify an _EXPLAIN text for the notification option
PHPBB3-11103
2012-10-13 23:52:49 -05:00
cb93784126
[ticket/11103] UCP Notification List
...
PHPBB3-11103
2012-10-13 20:02:38 -05:00
1b56a1d6be
[ticket/11103] Finishing up report post/pm and adding report closed
...
PHPBB3-11103
2012-10-11 22:36:48 -05:00
6d53bd4675
[ticket/11103] Finishing up PM Report notifications
...
PHPBB3-11103
2012-10-09 22:28:41 -05:00
9d955507b6
Merge branch 'ticket/11140' of github.com:EXreaction/phpbb3 into ticket/11103
2012-10-09 22:03:18 -05:00
b33e527394
[ticket/11103] Working on report notifications (post/pm)
...
PHPBB3-11103
2012-10-09 22:02:49 -05:00
3fa0ab7073
Merge PR #1004 branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11131] Correctly use indefinite article for "warning".
2012-10-09 19:41:25 -04:00
948bd69495
[ticket/11103] Move UCP Notification Options to Board Preferences tab
...
Also rename to "Edit notification options" for consistency
PHPBB3-11103
2012-10-05 13:54:27 -05:00
0bab8ff777
[ticket/11103] ACP option to enable/disable notifications output in header
...
PHPBB3-11103
2012-10-05 13:43:03 -05:00
07fb66ac10
[ticket/11103] Do not abbreviate template output
...
PHPBB3-11103
2012-10-04 14:31:00 -05:00
dbeace22c8
[ticket/11131] Correctly use indefinite article for "warning".
...
PHPBB3-11131
2012-10-02 14:58:20 +02:00
521992215c
[ticket/11103] Language key needed in the UCP
...
PHPBB3-11103
2012-09-27 19:08:22 -05:00
dfb17f444a
[ticket/11103] Fix module setup, add explanation to template
...
PHPBB3-11103
2012-09-27 19:04:47 -05:00
48ccc9eb93
[ticket/11103] UCP Notification Options can now be set
...
PHPBB3-11103
2012-09-27 18:25:37 -05:00
544fbe35f4
[ticket/11103] Some tweaks to the template output
...
PHPBB3-11103
2012-09-26 22:59:22 -05:00
