mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-01 03:54:56 +02:00
Code Issues Releases Wiki Activity
34,753 Commits 18 Branches 192 Tags
Commit Graph

559 Commits

Author SHA1 Message Date
Joas Schilling
f426fa0295 Merge remote-tracking branch 'prototech/ticket/11959' into develop-ascraeus 
* prototech/ticket/11959:
  [ticket/11959] Move phpbb_generate_string_list() to functions_content.php.
  [ticket/11959] Add unit tests.
  [ticket/11959] Remove use of plurals and make it possible to use Oxford comma.
  [ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name.
  [ticket/11959] Simplify how the users are trimmed.
  [ticket/11959] Add function to create a string list.
  [ticket/11959] Add samples for the untrimmed strings.
  [ticket/11959] List the last user with "and" instead of a comma.
  [ticket/11959] Use the plurals system for the untrimmed language strings.
  [ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text.
  [ticket/11959] Use plurals for the language strings.
 2014-03-29 20:39:22 +01:00
Cesar G
7c1ab5f79d [ticket/11959] Remove use of plurals and make it possible to use Oxford comma. 
PHPBB3-11959
 2014-03-19 03:08:34 -07:00
Cesar G
285ad0f6fa [ticket/11959] Simplify how the users are trimmed. 
PHPBB3-11959
 2014-03-19 03:08:33 -07:00
Cesar G
7cc1a8d224 [ticket/11959] Add samples for the untrimmed strings. 
PHPBB3-11959
 2014-03-19 03:08:33 -07:00
Cesar G
b32a66ca78 [ticket/11959] List the last user with "and" instead of a comma. 
PHPBB3-11959
 2014-03-19 03:08:33 -07:00
Cesar G
126ee37f66 [ticket/11959] Use the plurals system for the untrimmed language strings. 
PHPBB3-11959
 2014-03-19 03:08:33 -07:00
Cesar G
7e4b7a1542 [ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text. 
PHPBB3-11959
 2014-03-19 03:08:33 -07:00
Cesar G
6a278248e5 [ticket/11959] Use plurals for the language strings. 
PHPBB3-11959
 2014-03-19 03:08:33 -07:00
netdeamon
a8274ae137 [ticket/12198] Language issue in en/common.php 
Deleted lines as they are not needed anymore.

PHPBB3-12198
 2014-03-18 22:13:10 +05:30
Andreas Fischer
4ecfc07e03 Merge pull request #2113 from nickvergessen/ticket/8041 
[ticket/8041] Merge item name into "Return to" string for better translations

* nickvergessen/ticket/8041:
  [ticket/8041] Add space/tabs after => in array list
  [ticket/8041] Wrap forum name, topic title and pm folder name with quotes
  [ticket/8041] Merge item name into "Return to" string for better translations
 2014-03-13 11:02:29 +01:00
Joas Schilling
dfa077710f [ticket/8041] Wrap forum name, topic title and pm folder name with quotes 
PHPBB3-8041
 2014-03-12 18:47:02 +01:00
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
Joas Schilling
9419edd686 [ticket/8041] Merge item name into "Return to" string for better translations 
PHPBB3-8041
 2014-03-12 01:05:05 +01:00
Crizzo
239f72ddda [ticket/10549] changed "right" to "incorrect" 
PHPBB3-10549
 2014-03-11 18:24:35 +01: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
ec4c9833ca [ticket/10549] Adds language variables 
PHPBB3-10549
 2014-03-10 18:35:23 +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
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
76409388af [ticket/12234] Replace ICQ with custom profile field 
PHPBB3-12234
 2014-02-28 15:24:35 +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
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
Cesar G
f4b832a27d [ticket/12034] AJAXify notifications popup. 
PHPBB3-12034
 2013-12-30 11:12:15 -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
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
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
Lukasz
d5ffb30025 [ticket/12005] Remove language vars used by PM popup 
PHPBB3-12005
 2013-11-08 21:57:09 +01:00
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
Vjacheslav Trushkin
23954ac1b8 [ticket/11969] New language strings for first and last post links 
PHPBB3-11969
 2013-10-25 14:17:51 +03: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
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
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