mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-29 06:26:22 +01:00
Code Issues Releases Wiki Activity
20,207 Commits 10 Branches 193 Tags
a0f8e79612e19dec50101474695873a0ef78c164
Commit Graph

944 Commits

Author SHA1 Message Date
Cesar G
2e6911b7e7 Merge remote-tracking branch 'VSEphpbb/ticket/12292' into develop-ascraeus 
* VSEphpbb/ticket/12292:
  [ticket/12292] Fix syntax error in admin.css
 2014-03-22 20:50:21 -07:00
Matt Friedman
b6b32c2340 [ticket/12292] Fix syntax error in admin.css 
PHPBB3-12292
 2014-03-22 19:49:03 -07:00
Joas Schilling
13eb0ec5b9 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12035] Correcting the condition
  [ticket/12035] Adding necessary conditions
  [ticket/12035] Adding link to user posts to ACP page

Conflicts:
	phpBB/adm/style/acp_users_overview.html
 2014-03-22 15:13:41 +01:00
Joas Schilling
b191c1c5a6 Merge remote-tracking branch 'geetakshi/ticket/11357' into develop-ascraeus 
* geetakshi/ticket/11357:
  [ticket/11357] Correcting invalid markup
 2014-03-22 14:15:09 +01:00
Matt Friedman
e4f6d9bc90 [ticket/12292] Improve style details page 
http://tracker.phpbb.com/browse/PHPBB3-12292
Gave style details page a proper heading and back button.
Also removed a few obsolete code leftovers in the style
and CSS.

PHPBB3-12292
 2014-03-20 18:11:45 -07:00
geetakshi
5316c32b10 [ticket/12035] Adding necessary conditions 
PHPBB3-12035
 2014-03-20 03:36:53 +05:30
geetakshi
51ff202820 [ticket/11357] Correcting invalid markup 
PHPBB3-11357
 2014-03-19 19:59:19 +05:30
Matt Friedman
e46e3111e2 [ticket/12284] Improve readability of extension manager details 
Use span tags like the rest of the ACP does, instead of P tags.
There is no semantic need to use P tags here. These are not
paragraphs.

PHPBB3-12284
 2014-03-17 12:10:18 -07:00
geetakshi
418034af0e [ticket/12035] Adding link to user posts to ACP page 
Adding link of posts behind displayed number of posts of the user

PHPBB3-12035
 2014-03-17 00:52:11 +05:30
Matt Friedman
a29ad78da6 [ticket/12274] Add core.js to the install footer 
Required so phpbb var is defined, as it is used in admin.js.

PHPBB3-12274
 2014-03-16 07:56:26 -07:00
Joas Schilling
0aa23d203e Merge remote-tracking branch 'EXreaction/ticket/9871-2' into develop 
* EXreaction/ticket/9871-2:
  [ticket/9871] Can set current version to use instead of the phpBB version
  [ticket/9871] Fix indentation on comment
  [ticket/9871] Fix test name
  [ticket/9871] Split fast and slow version tests
  [ticket/9871] Option to force the stability when checking for updates
  [ticket/9871] Allow setting the host/file to load for the version class
  [ticket/9871] Restore get_remote_file_test
  [ticket/9871] Fix tests
  [ticket/9871] Typehint and comment on var types
  [ticket/9871] Mark test as slow
  [ticket/9871] Restore phpbb_version_compare
  [ticket/9871] Restore get_remote_file
  [ticket/9871] Use $request->variable instead of request_var
  [ticket/9871] Update version check file to use json format
 2014-03-14 14:04:30 +01:00
Joas Schilling
c695aa3903 Merge remote-tracking branch 'vsephpbb/ticket/12029' into develop 
* vsephpbb/ticket/12029:
  [ticket/12029] Remove ellipsis and wrap long sidebar items in ACP
 2014-03-13 23:55:19 +01:00
Matt Friedman
2c0efd5d1b [ticket/12029] Remove ellipsis and wrap long sidebar items in ACP 
PHPBB3-12029
 2014-03-13 15:24:27 -07:00
Matt Friedman
2de3943cec [ticket/12073] Increase size of samp and code tags in ACP 
PHPBB3-12073
 2014-03-13 15:08:21 -07:00
Andreas Fischer
19d0c2abd5 Merge remote-tracking branch 'VSEphpbb/ticket/12248' into develop 
* VSEphpbb/ticket/12248:
  [ticket/12248] Restore id attributes to extension details (used by tests)
 2014-03-06 23:50:07 +01:00
Matt Friedman
aae22d699e [ticket/12248] Restore id attributes to extension details (used by tests) 
PHPBB3-12248
 2014-03-06 12:02:27 -08:00
Nathan Guse
4b6f3f8b0f Merge pull request #2088 from nickvergessen/ticket/12236 
Ticket/12236 Convert AOL and Yahoo to custom profile fields
 2014-03-05 18:44:39 -06:00
Nathan Guse
9b1b57c649 Merge pull request #2080 from nickvergessen/ticket/12243 
[Ticket/12243] subsilver2 is missing profile field files
 2014-03-05 18:29:07 -06:00
Nathan Guse
3ece3223e4 Merge pull request #2086 from VSEphpbb/ticket/12248 
[ticket/12248] Make extension details homepage a clickable link
 2014-03-05 18:27:29 -06:00
Matt Friedman
898976f8a1 [ticket/12248] Remove unused label for attributes and related id tags 
PHPBB3-12248
 2014-03-05 15:05:40 -08:00
Matt Friedman
2e49efc12d [ticket/12248] Use id instead of name attribute in a tags 
PHPBB3-12248
 2014-03-05 14:54:04 -08:00
Matt Friedman
4e770c2b42 [ticket/12248] Fix meta_author tags (IDs must be unique) 
PHPBB3-12248
 2014-03-05 14:53:31 -08:00
Matt Friedman
d0b07503ad [ticket/12248] Remove p tag in favor of strong tag 
PHPBB3-12248
 2014-03-05 14:45:45 -08: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
71354ef185 [develop] Fix incorrect merge conflict resolution from PR #2085 
PHPBB3-12235
 2014-03-05 11:51:38 +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
Matt Friedman
03492e6211 [ticket/12248] Make extension details homepage a clickable link 
http://tracker.phpbb.com/browse/PHPBB3-12248

PHPBB3-12248
 2014-03-04 15:49:33 -08:00
Joas Schilling
83a7e632b9 [ticket/12235] Convert WLM to custom profile field 
PHPBB3-12235
 2014-03-04 10:19:08 +01:00
hjpotter92
c82f59b5ab [ticket/12245] Fix id attributes in acp_prune_users.html 
The following labels had invalid id references:
1. joined (renamed to link to joined_after)
2. group_id (create teh id attribute on select box)

PHPBB3-12245
 2014-03-04 03:41:45 +05:30
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
Joas Schilling
3e52d780ba [ticket/12243] Remove outdated adm/style/custom_profile_fields.html 
PHPBB3-12243
 2014-03-03 12:16:22 +01:00
Crizzo
50e4cac5de [ticket/12126] left:0 and right: 0; admin.css --> width: auto 
PHPBB3-12126
 2014-03-02 22:41:38 +01:00
Crizzo
f997d98a2a [ticket/12126] Changed .phpbb_alert "max-width: 640px" to "width: 620px" 
PHPBB3-12126
 2014-03-02 18:43:31 +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
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
Nathan Guse
4f6b9080e8 Merge pull request #2037 from prototech/ticket/12080 
[ticket/12080] Fix color palettes when responsive.
 2014-02-20 20:59:14 -06:00
Cesar G
55b38e8003 [ticket/12200] Add missing profile field template files to adm/style/ directory 
PHPBB3-12200
 2014-02-19 22:08:36 -08:00
Nathan Guse
6c8589775b [ticket/9871] Update version check file to use json format 
PHPBB3-9871
 2014-02-19 16:13:23 -06:00
Cesar G
f43dedb3fd [ticket/12153] Replace old template variables with {PAGE_NUMBER}. 
PHPBB3-12153
 2014-02-19 13:16:58 -08:00
Nathan Guse
7015fc8a00 Merge pull request #2002 from prototech/ticket/12153 
[ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination()
 2014-02-18 14:11:48 -06:00
Cesar G
b3ecb9e1e4 Merge remote-tracking branch 'Zoddo/ticket/12003' into develop 
* Zoddo/ticket/12003:
  [ticket/12003] ACP broken when error thrown
 2014-02-17 10:27:23 -08:00
Zoddo
b942615c3b [ticket/12003] ACP broken when error thrown 
Fix display of ACP when error is outputted before <html> tag.

PHPBB3-12003
 2014-02-17 19:21:20 +01:00
Cesar G
b8c836836b [ticket/12080] Stop responsive ACP sig textarea from dropping to second line. 
PHPBB3-12080
 2014-02-16 13:27:48 -08:00
Cesar G
bfbf0fefbf [ticket/12080] Reduce the palette options in all locations when responsive. 
PHPBB3-12080
 2014-02-16 13:27:01 -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
38608bfa62 [ticket/12115] Remove occupation field from html files 
PHPBB3-12115
 2014-02-06 11:32:07 +01:00