1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

1830 Commits

Author SHA1 Message Date
David King
47f7992bf1 [ticket/11975] Change shortened ACP/MCP label to Administer/Moderate
Also utilizing the new data-responsive-text attribute

PHPBB3-11975
2013-11-02 15:34:19 -07:00
David King
54e82392f0 [ticket/11975] Make link text shorter on smaller resolutions
PHPBB3-11975
2013-11-02 15:34:18 -07:00
Nathan Guse
0a3bb18e93 Merge pull request #1812 from prototech/ticket/11746
[ticket/11746] Add "admin activation required" notification.
2013-11-02 11:55:16 -07:00
Joas Schilling
ce487aad09 [ticket/11974] Fix timezone names with underscores
PHPBB3-11974
2013-10-27 00:48:23 +02:00
Joas Schilling
2086db0d7a [ticket/11974] Translate all timezones
PHPBB3-11974
2013-10-27 00:21:17 +02:00
Cesar G
c5fc8c43cb [ticket/11746] Delete the notification after user is approved & fix language.
PHPBB3-11746
2013-10-26 01:01:08 -07:00
Cesar G
d607f1c927 [ticket/11746] Add "admin activation required" notification.
PHPBB3-11746
2013-10-24 02:37:20 -07:00
Matt Friedman
2867831232 [ticket/11921] Move any HTML for Notifications to the templates
PHPBB3-11921
2013-10-16 10:07:54 -07:00
Matt Friedman
8608204097 [ticket/11921] Improve appearance of PM notifications in linklist
PHPBB3-11921
2013-10-15 10:29:15 -07:00
Matt Friedman
9363986f43 [ticket/11921] Improve appearance of Notifications in linklist
PHPBB3-11921
2013-10-15 10:27:00 -07:00
Nils Adermann
40932c26ea Merge pull request #1772 from bantu/feature/plupload/integration
[ticket/10929] Integration of Plupload
2013-10-13 16:01:00 -07:00
Andreas Fischer
2050a39da7 [feature/plupload/integration] Integration of Plupload
This commit is a highly-refactored and up-to-date version of Fyorl's work
which was part of his Google Summer of Code 2012 project "Attachment
Improvements".

PHPBB3-10929
2013-10-11 17:40:16 +02:00
Andreas Fischer
67530d132a [feature/plupload/cron] Add cronjob for cleaning plupload temporary directory.
PHPBB3-10929
2013-10-11 15:48:04 +02:00
Andreas Fischer
94b49d8a92 [ticket/11703] Make jQuery CDN switch more generic.
Config variable: load_jquery_cdn -> allow_cdn
Template variable: S_JQUERY_FALLBACK -> S_ALLOW_CDN

PHPBB3-11703
2013-10-10 23:26:03 +02:00
Dhruv
2adb8499a9 Merge remote-tracking branch 'prototech/ticket/11739' into develop
# By Cesar G
# Via Cesar G
* prototech/ticket/11739:
  [ticket/11739] Rename “Remember Me” login keys module
2013-10-07 00:42:56 +05:30
Cesar G
be9b767019 [ticket/11739] Rename “Remember Me” login keys module
PHPBB3-11739
2013-10-05 21:38:20 -07:00
Cesar G
70c757a3a9 [ticket/11894] Fix typo in "Delete post" option
PHPBB3-11894
2013-10-05 20:59:07 -07:00
Nathan
621e6c93ed [ticket/11883] Report completed data step in migration as "Installing Data"
PHPBB3-11883
2013-10-02 14:27:46 -05:00
Prosk8er
30a26f23a4 [ticket/11844] update acp/authentication language var
the language var ACP_AUTH_SETTINGS_EXPLAIN in language/en/acp/board.php

PHPBB3-11844
2013-09-14 15:28:04 -04:00
Joseph Warner
3c6c1ec5f2 [ticket/11837] Replace escaped single quote with utf-8 single quote
PHPBB3-11837
2013-09-13 16:26:30 -04:00
Joseph Warner
b7ab068bbc [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED
PHPBB3-11837
2013-09-13 11:48:31 -04:00
Joas Schilling
958f3e9503 Merge remote-tracking branch 'imkingdavid/ticket/11824' into develop 2013-09-13 16:48:28 +02:00
Nathan Guse
f723491527 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11373
# By Joseph Warner (188) and others
# Via Andreas Fischer (41) and others
* 'develop' of github.com:phpbb/phpbb3: (435 commits)
  [ticket/11745] Correct language, coding guidelines
  [ticket/11828] Fix greedy operators in lexer
  [ticket/11835] Fix ucp_auth_link adding in migration
  [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
  [ticket/develop/11832] Fix path detection
  [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE
  [ticket/11833] Fix bad template loop
  [feature/oauth] Fix tabindex
  [ticket/11816] !$DOESNT_EXIST test
  [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php
  [ticket/11829] Use report_closed to determine status in MCP report_details
  [ticket/11825] Move schema_data.php into includes/ instead of phpbb/
  [ticket/11215] Remove unnecessary comment
  [ticket/11755] MySQL upgrader out of date
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
  [ticket/11823] Set up nginx server to match PHP files with characters after .php
  [ticket/11812] Fix empty define
  [ticket/11818] Update Symfony dependencies to 2.3.*
  [feature/oauth] Fix bug on ucp_auth_link related to error display
  ...
2013-09-12 23:34:34 -05:00
David King
f22b959257 Merge pull request #1620 from EXreaction/ticket/11745
Group join approved notification
2013-09-12 21:25:00 -07:00
David King
d629738675 Merge pull request #1617 from EXreaction/ticket/11744
[ticket/11744] Group join request notification
2013-09-12 21:24:11 -07:00
Nathan Guse
32b9254740 [ticket/11745] Correct language, coding guidelines
PHPBB3-11745
2013-09-12 22:59:42 -05:00
David King
6f4ad0bcfa [ticket/11824] Update language string for board settings
PHPBB3-11824
2013-09-12 09:21:40 -07:00
Joseph Warner
3a6b3d7c2b [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth
Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
	phpBB/develop/create_schema_files.php
	phpBB/includes/ucp/ucp_register.php

PHPBB3-11673
2013-09-06 20:35:54 -04:00
David King
2ccc992da1 [ticket/11824] Fix logic
PHPBB3-11824
2013-09-06 12:48:09 -07:00
David King
010da72f64 [ticket/11824] Add option for mod_rewrite
PHPBB3-11824
2013-09-03 16:57:27 -07:00
Andreas Fischer
5ddb0ba629 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11769] Allow using 0 as poster name
  [ticket/11769] Allow '0' as username
  [ticket/11769] Allow '0' as username in notification mails
  [ticket/11769] Fix language issues in the doc blocks
  [ticket/11769] Correctly supply the post author's username in posting.php

Conflicts:
	phpBB/includes/functions_posting.php
2013-09-02 12:31:27 +02:00
Andreas Fischer
68555d2d51 Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [ticket/11769] Allow using 0 as poster name
  [ticket/11769] Allow '0' as username
  [ticket/11769] Allow '0' as username in notification mails
  [ticket/11769] Fix language issues in the doc blocks
  [ticket/11769] Correctly supply the post author's username in posting.php

Conflicts:
	phpBB/language/en/email/forum_notify.txt
	phpBB/language/en/email/newtopic_notify.txt
	phpBB/language/en/email/topic_notify.txt
2013-09-02 12:30:10 +02:00
Andreas Fischer
48825975d1 [ticket/11821] Fix comma usage next to "You are receiving this notification".
This is a partial backport of 31502cdd6c3a5bac5164ec30530e5b4bf63f3196.

PHPBB3-11821
2013-09-02 11:41:31 +02:00
Joseph Warner
a8ffbce99f [feature/oauth] Changes due to code review
PHPBB3-11673
2013-08-24 22:04:04 -04:00
Joseph Warner
3df9585029 [feature/oauth] Fix indentation on new language constants
PHPBB3-11673
2013-08-24 17:21:18 -04:00
Joseph Warner
d398ae41c0 [feature/oauth] Finish cleaning up TODOs
PHPBB3-11673
2013-08-24 17:20:19 -04:00
Joseph Warner
27ba57747a [feature/oauth] Clean up TODOs
PHPBB3-11673
2013-08-24 17:17:31 -04:00
Joas Schilling
2ce83fce1e [ticket/11769] Allow '0' as username in notification mails
PHPBB3-11769
2013-08-23 23:53:33 +02:00
Joseph Warner
d13a1788f0 [feature/oauth] Update language constants for ucp_auth_link
PHPBB3-11673
2013-08-14 17:08:08 -04:00
Joseph Warner
deb62d51fe [feature/oauth] Start building the template
PHPBB3-11673
2013-08-09 05:12:57 -04:00
Dhruv
f35d732f40 Merge remote-tracking branch 'nickvergessen/ticket/11574' into develop
# By Joas Schilling (16) and Igor Wiedler (6)
# Via Joas Schilling (5) and Igor Wiedler (2)
* nickvergessen/ticket/11574: (22 commits)
  [ticket/11574] Remove install/udpate/new/ fallback from database_update.php
  [ticket/11574] Do not display incompatible package note after successful update
  [ticket/11574] Remove old "continue step"-message
  [ticket/11574] Change order of files and database update
  [ticket/11574] Fix more issues in the updater
  [ticket/11574] Add trailing slash for consistency
  [ticket/11574] Fix table prefix in database updater
  [ticket/11574] Fix various path issues in the updater
  [ticket/11574] Make install language filename less crazy
  [ticket/11574] Use alternate DI config file for updater
  [ticket/11574] Include normalizer so it loads form the correct directory
  [ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;)
  [ticket/11574] Use log object instead of old function
  [ticket/11574] Include vendor into update packages
  [ticket/11574] Create phpbb_log object before using it.
  [ticket/11574] Add correct language parameter to return links
  [ticket/11574] Use request object rather then request_var function
  [ticket/11574] Load new language files whenever possible
  [ticket/11574] Require new files in install/index.php and add a class loader
  [ticket/11574] Require new files in database_update.php and add a class loader
  ...
2013-08-08 13:56:39 +05:30
Joseph Warner
4683c37682 [feature/oauth] Forgot to have login_link be "in login" in ucp
PHPBB3-11673
2013-08-05 17:35:44 -04:00
Joseph Warner
baa3a750c4 [feature/oauth] Start general auth linking page
PHPBB3-11673
2013-08-05 15:38:03 -04:00
Joseph Warner
c5515eaf54 [feature/oauth] Reword some of the language text
PHPBB3-11673
2013-07-30 14:16:44 -04:00
Joas Schilling
af0f5128c6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11752] HTTP -> HTTPs in email/installed.txt
2013-07-30 01:47:02 +02:00
Joas Schilling
32499c8808 [ticket/11574] Remove install/udpate/new/ fallback from database_update.php
Since we switched the order, everything should be in the normal root by
then.

PHPBB3-11574
2013-07-30 01:38:06 +02:00
Joas Schilling
91392c7288 Merge remote-tracking branch 'phpbb/develop' into ticket/11574
* phpbb/develop: (130 commits)
  [ticket/11638] Changed the layout to match the other similar commits
  [ticket/11640] removed the space that I wonder what it was doing there.
  [ticket/11749] Move event after all template data has been defined
  [ticket/10917] Variable used only once so delete it
  [ticket/10917] Revert use of phpbb wrapper
  [ticket/11749] Template events for topic_list_row_pre/append
  [ticket/11749] PHP Events for viewforum.php
  [ticket/11749] PHP Events for search.php
  [ticket/11740] Update FAQ to include Ideas Centre
  [ticket/11062] If user's language is english there is no further work needed
  [ticket/11062] Load new strings from user's language file if provided
  [ticket/10917] Using phpbb wrapper
  [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
  [ticket/11741] Fix empty brackets and remove bullet
  [ticket/11638] Removed the unneeded reset.
  [ticket/11638] Use the $parse_flags like the other commits
  [ticket/11638] Reverted to use the $parse tags way as the other ones
  [ticket/11638] Updated: bitwise $parse_flags use optionset()
  [ticket/11656] Made the check for the bitfield just like other PR's
  [ticket/11667] Use @inheritdoc
  ...
2013-07-30 01:06:11 +02:00
Andreas Fischer
18164e63e2 [ticket/11752] HTTP -> HTTPs in email/installed.txt
PHPBB3-11752
2013-07-30 01:06:10 +02:00
Joas Schilling
5bb08a1ab9 [ticket/11574] Change order of files and database update
PHPBB3-11574
2013-07-29 21:30:01 +02:00
Joseph Warner
c09bda10fc [feature/oauth] Properly check that all data needed is available
PHPBB3-11673
2013-07-29 13:11:15 -04:00