mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity
19,987 Commits 17 Branches 190 Tags
Commit Graph

1889 Commits

Author SHA1 Message Date
Andreas Fischer
b809bea3d4 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10549] using correct variable in includes/functions_module.php too
  [ticket/10549] changed "right" to "incorrect"

Conflicts:
	phpBB/includes/functions_module.php
 2014-03-12 16:28:47 +01:00
Crizzo
239f72ddda [ticket/10549] changed "right" to "incorrect" 
PHPBB3-10549
 2014-03-11 18:24:35 +01:00
Nathan Guse
052bbf654f Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop 
* remotes/upstream/develop-olympus:
  [ticket/12106] Combined first and second sentence
  [ticket/12106] Adds a explaination that admin/mods still able to use the board

Conflicts:
	phpBB/language/en/acp/board.php
 2014-03-10 21:51:07 -05:00
Nathan Guse
9aa947f7fb Merge pull request #2105 from Crizz0/ticket/12106 
[ticket/12106] Adds a explaination that admin/mods still able to use the...
 2014-03-10 21:49:29 -05:00
Nathan Guse
3181c44fc9 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10549] Adds language variables

Conflicts:
	phpBB/includes/functions_module.php
 2014-03-10 21:44:04 -05:00
Crizzo
957e9aabc3 [ticket/12106] Combined first and second sentence 
PHPBB3-12106
 2014-03-10 21:19:25 +01:00
Crizzo
13327a13a0 [ticket/12106] Adds a explaination that admin/mods still able to use the board 
PHPBB3-12106
 2014-03-10 18:50:39 +01:00
Crizzo
ec4c9833ca [ticket/10549] Adds language variables 
PHPBB3-10549
 2014-03-10 18:35:23 +01:00
Joas Schilling
600e5f6c11 [ticket/12251] Add string validation for a-zA-Z0-9 and underscore 
PHPBB3-12251
 2014-03-06 12:28:36 +01:00
Joas Schilling
d380cdec02 [ticket/12236] Fix language key name for Yahoo Messanger 
PHPBB3-12236
 2014-03-06 01:41:38 +01:00
Joas Schilling
f2059f52f3 [ticket/12236] Move AOL Instant Messanger field to custom profile field 
PHPBB3-12236
 2014-03-05 22:13:22 +01:00
Joas Schilling
2e5106aae1 [ticket/12237] Convert yahoo messanger to custom profile field 
PHPBB3-12237
 2014-03-05 21:38:57 +01:00
Nils Adermann
0e35a85155 Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into develop 
* github-nickvergessen/ticket/12235:
  [ticket/12235] Convert WLM to custom profile field
  [ticket/12187] Do not make clickable when using as contact field
  [ticket/12187] Split generate_profile_fields_template() into 2 methods
  [ticket/12187] Remove user_website field
  [ticket/12187] Remove user_website functionality
  [ticket/12187] Convert website field data to custom profile field
  [ticket/12187] Add URL type for profile fields
  [ticket/12234] Replace ICQ with custom profile field
  [ticket/12233] Update schema file
  [ticket/12233] Add images back to subsilver2
  [ticket/12233] Allow profile fields to be contact fields

Conflicts:
	phpBB/adm/style/acp_prune_users.html
 2014-03-05 11:49:11 +01:00
Nils Adermann
4e144005f0 Merge pull request #2057 from nickvergessen/ticket/12226 
Ticket/12226 Split language strings to correctly allow multiple plural rules
 2014-03-05 11:31:38 +01:00
Joas Schilling
83a7e632b9 [ticket/12235] Convert WLM to custom profile field 
PHPBB3-12235
 2014-03-04 10:19:08 +01:00
Joas Schilling
5b1fbfb2f2 [ticket/12187] Remove user_website functionality 
PHPBB3-12187
 2014-03-03 20:01:19 +01:00
Joas Schilling
a2f2629e2a [ticket/12187] Add URL type for profile fields 
PHPBB3-12187
 2014-03-03 12:30:07 +01:00
Matt Friedman
87fa7b98cc [ticket/11645] Rename .MODs tab in ACP to Extensions 
http://tracker.phpbb.com/browse/PHPBB3-11645

PHPBB3-11645
 2014-03-02 11:58:26 -08:00
Joas Schilling
76409388af [ticket/12234] Replace ICQ with custom profile field 
PHPBB3-12234
 2014-02-28 15:24:35 +01:00
Joas Schilling
a823205403 [ticket/12233] Allow profile fields to be contact fields 
Contact fields are displayed with in the contact section of the user profile
and are displayed differently in the mini profile next to posts and private
messages

PHPBB3-12233
 2014-02-28 14:38:03 +01:00
Joas Schilling
bd00b8e9bf [ticket/12227] "X from Y messages" should be "X out of Y messages" 
PHPBB3-12227
 2014-02-24 09:48:36 +01:00
Joas Schilling
87dfd76100 [ticket/12226] Split language strings to correctly allow multiple plural rules 
PHPBB3-12226
 2014-02-24 09:46:31 +01:00
Cesar G
a589c88d25 [ticket/12206] Fix mismatched Plupload language vars preventing localization. 
PHPBB3-12206
 2014-02-17 12:33:19 -08:00
Joas Schilling
995019a992 [ticket/12169] Add new option to display profile fields on memberlist 
PHPBB3-12169
 2014-02-10 16:28:21 +01:00
Joas Schilling
6bee91c429 [ticket/12169] Convert user_from to profile field location 
Missing changes on memberlist view due to missing functionality

PHPBB3-12169
 2014-02-10 14:38:43 +01:00
Joas Schilling
bbada27ee9 [ticket/12115] Also port user interests to profile fields 
PHPBB3-12115
 2014-02-06 11:32:11 +01:00
Joas Schilling
0ad726768c [ticket/12115] Remove old language strings 
PHPBB3-12115
 2014-02-06 11:32:09 +01:00
Nathan Guse
ad2d1fcbcb Merge pull request #1942 from nickvergessen/ticket/11996 
[ticket/11996] Add explanation how to correctly remove and update an extension
 2014-02-03 11:49:24 -08:00
Joas Schilling
c7f6cccdf1 [ticket/11996] Remove note until we really do disable the board 
PHPBB3-11996
 2014-02-03 20:48:01 +01:00
Cesar G
628323a80a [ticket/11915] Remove unused language string. 
PHPBB3-11915
 2014-01-17 19:20:37 -08:00
Cesar G
020b7a31bf [ticket/11915] Make the user aware of the drag-and-drop zone. 
PHPBB3-11915
 2014-01-17 19:20:37 -08:00
Cesar G
b3a25c52e5 [ticket/12096] Use plurals for MAX_NUM_SEARCH_KEYWORDS_REFINE. 
PHPBB3-12096
 2014-01-16 11:48:40 -08:00
Joas Schilling
b155056cb9 [ticket/11996] Use a table for better styling 
PHPBB3-11996
 2014-01-13 10:31:54 +01:00
Cesar G
f4b832a27d [ticket/12034] AJAXify notifications popup. 
PHPBB3-12034
 2013-12-30 11:12:15 -08:00
Joas Schilling
95d4e6aa97 [ticket/11996] Add explanation how to correctly remove and update an extension 
See http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=44001 for more
information about the decision.

PHPBB3-11996
 2013-12-27 15:25:03 +01:00
Joas Schilling
bef7bc7900 [ticket/11911] Warn admins when there is no search index for the selected engine 
PHPBB3-11911
 2013-12-27 13:16:38 +01:00
Cesar G
c42bd28d17 [ticket/12009] Prevent user from enabling invalid extension through direct URL 
PHPBB3-12009
 2013-12-12 14:40:03 -08:00
Cesar G
e110d591a9 [ticket/11241] Consolidate topic actions into "Topic tools" dropdown. 
PHPBB3-11241
 2013-12-06 00:56:24 -08:00
Joas Schilling
8f504b1ca5 Merge remote-tracking branch 'cyberalien/ticket/11969' into develop 
* cyberalien/ticket/11969:
  [ticket/11969] Change topic link to unread post in subsilver2
  [ticket/11969] Change topic link to unread post in prosilver
  [ticket/11969] New language strings for first and last post links
 2013-12-03 18:29:10 +01:00
Dhruv
d867bda6af Merge remote-tracking branch 'nickvergessen/ticket/12045' into develop 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/12045:
  [ticket/12045] Only display group selection if there are groups
  [ticket/12045] Correctly close <span> before closing parent tag
  [ticket/12045] Correctly close <dd> with </dd>
 2013-11-30 17:21:40 +05:30
Joas Schilling
5d69eddcf5 [ticket/12045] Only display group selection if there are groups 
Also fixed the empty option which is not allowed.

PHPBB3-12045
 2013-11-28 13:22:25 +01:00
Joas Schilling
f3d7823050 [ticket/12042] Replace B with a more meaningful key name 
PHPBB3-12042
 2013-11-27 18:54:51 +01:00
Joas Schilling
6a2d0c345c [ticket/12042] Add all language strings from PLUpload 2.0 to the language file 
PHPBB3-12042
 2013-11-27 18:09:38 +01:00
Joas Schilling
c49e7387d6 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12037] Fix hard-coded text in acp_inactive.html.

Conflicts:
	phpBB/adm/style/acp_inactive.html
 2013-11-26 11:33:17 +01:00
Cesar G
e111d7bd13 [ticket/12037] Fix hard-coded text in acp_inactive.html. 
PHPBB3-12037
 2013-11-25 12:38:53 -08:00
Nathan Guse
df7fa8e499 Merge pull request #1854 from Pico88/ticket/12005 
[ticket/12005] Remove code responsible for PM popup completely
 2013-11-21 14:01:23 -08:00
Cesar G
bcf347420e [ticket/11959] Trim the list of users from post notifications. 
PHPBB3-11959
 2013-11-21 13:02:26 -08:00
Joas Schilling
46994e8dfb Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11814] Remove redundant text from the topic reply email notification.
 2013-11-19 15:28:37 +01:00
Cesar G
f833a42e7e [ticket/11814] Remove redundant text from the topic reply email notification. 
PHPBB3-11814
 2013-11-19 06:20:37 -08:00
Lukasz
d5ffb30025 [ticket/12005] Remove language vars used by PM popup 
PHPBB3-12005
 2013-11-08 21:57:09 +01:00