Commit graph

20529 commits

Author SHA1 Message Date
Matt Friedman
6de0350836 [ticket/12342] Fix the Custom Dates function in UCP Prefs Global
Function was being called before dE() function exists,
causing it to fail. Should be called when the page/window
is ready.

PHPBB3-12342
2014-04-01 18:02:27 -07:00
Matt Friedman
18645aa069 [ticket/12342] Fix Find a member show / hide script
PHPBB3-12342
2014-04-01 18:00:17 -07:00
Matt Friedman
0f3e6ca676 [ticket/12342] Use prop() instead of attr() for boolean properties
PHPBB3-12342
2014-04-01 17:58:56 -07:00
Joas Schilling
b6128dee3f [ticket/8700] Use L_COLON instead of adding ":" manually
PHPBB3-8700
2014-04-02 00:23:26 +02:00
Joas Schilling
bdc08a3fcd [ticket/8700] Remove unused language strings
Most of the strings were obsoleted by the removal of:
* Imagesets
* Themes
* Templates
* Editor
* Exporter

PHPBB3-8700
2014-04-02 00:17:39 +02:00
Oliver Schramm
31e1d7be8d [ticket/12341] Add tests for get_username_string()
PHPBB3-12341
2014-04-01 23:53:04 +02:00
Oliver Schramm
908057301c [ticket/7707] Add comma to last entry of arrays
PHPBB3-7707
2014-04-01 22:03:59 +02:00
Matt Friedman
025779ac62 [ticket/12337] Fix jQuery update migration file
PHPBB3-12337
2014-04-01 06:50:00 -07:00
Joas Schilling
e4170e6c54 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12329] changed all CSS classes to ".stat-block"
  [ticket/12329] Add <div> container to index blocks (stats, etc.)
2014-04-01 15:07:45 +02:00
Joas Schilling
5a3d4109bb Merge remote-tracking branch 'paybas/ticket/12329' into develop-ascraeus
* paybas/ticket/12329:
  [ticket/12329] changed all CSS classes to ".stat-block"
  [ticket/12329] Add <div> container to index blocks (stats, etc.)
2014-04-01 15:07:19 +02:00
Joas Schilling
7b64c6b3a6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12328] Change "since" to B3
  [ticket/12328] Add Template Event index_body_stat_blocks_after
2014-04-01 14:45:48 +02:00
Joas Schilling
00a3eabc59 Merge remote-tracking branch 'paybas/ticket/12328' into develop-ascraeus
* paybas/ticket/12328:
  [ticket/12328] Change "since" to B3
  [ticket/12328] Add Template Event index_body_stat_blocks_after
2014-04-01 14:45:36 +02:00
Joas Schilling
88f718bc6b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12322] Added profile-custom-field class
  [ticket/12322] CSS classes for postprofile-profile <dd> items
2014-04-01 14:38:04 +02:00
Joas Schilling
e9eb456f1a Merge remote-tracking branch 'paybas/ticket/12322' into develop-ascraeus
* paybas/ticket/12322:
  [ticket/12322] Added profile-custom-field class
  [ticket/12322] CSS classes for postprofile-profile <dd> items
2014-04-01 14:37:13 +02:00
PayBas
205e098b38 [ticket/12339] Add Event core.page_header_after
PHPBB3-12339
2014-04-01 14:25:40 +02:00
PayBas
e0f64b7058 [ticket/12329] changed all CSS classes to ".stat-block"
PHPBB3-12329
2014-04-01 12:53:13 +02:00
PayBas
6dac8813d0 [ticket/12322] Added profile-custom-field class
PHPBB3-12322
2014-04-01 10:58:44 +02:00
PayBas
d561e6ddaa [ticket/12333] Change event name
PHPBB3-12333
2014-04-01 10:55:13 +02:00
PayBas
a87e576d1e [ticket/12328] Change "since" to B3
PHPBB3-12328
2014-04-01 10:32:01 +02:00
Matt Friedman
2b77dcfca6 [ticket/12337] Update jQuery to version 1.11.0
PHPBB3-12337
2014-03-31 21:09:47 -07:00
Joas Schilling
7978eb06f6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12318] Use MySQL instead of MySQLi for now on HHVM.
  [ticket/12318] Pin HHVM version to 3.0.0~precise.
  [ticket/12318] Always install new config file on HHVM upgrade conflict.
  [ticket/12318] Add PPA providing dependencies for recent HHVM on Ubuntu 12.04.
  [ticket/12318] Upgrade to a recent stable version of HHVM.
  [ticket/12318] Correctly setup HHVM for functional tests.
2014-03-31 21:01:12 +02:00
Joas Schilling
7fb65f20da Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12318] Use MySQL instead of MySQLi for now on HHVM.
  [ticket/12318] Pin HHVM version to 3.0.0~precise.
  [ticket/12318] Always install new config file on HHVM upgrade conflict.
  [ticket/12318] Add PPA providing dependencies for recent HHVM on Ubuntu 12.04.
  [ticket/12318] Upgrade to a recent stable version of HHVM.
  [ticket/12318] Correctly setup HHVM for functional tests.
2014-03-31 20:58:03 +02:00
Joas Schilling
c2fbaf3af2 Merge remote-tracking branch 'bantu/ticket/12318-olympus' into develop-olympus
* bantu/ticket/12318-olympus:
  [ticket/12318] Use MySQL instead of MySQLi for now on HHVM.
  [ticket/12318] Pin HHVM version to 3.0.0~precise.
  [ticket/12318] Always install new config file on HHVM upgrade conflict.
  [ticket/12318] Add PPA providing dependencies for recent HHVM on Ubuntu 12.04.
  [ticket/12318] Upgrade to a recent stable version of HHVM.
  [ticket/12318] Correctly setup HHVM for functional tests.
2014-03-31 20:53:55 +02:00
Joas Schilling
2c0b08a890 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/9758] Clickable avatar in header and renamed class for avatar-img
  [ticket/9758] Remove unnessary if-question for include functions_display
  [ticket/9758] Slims the line 4775 in includes/functions.php
  [ticket/9758] Adds id and changes filter to fix travis CI test
  [ticket/9758] Removed the needless space after first ENDIF
  [ticket/9758] Adding impr. for overall_header display of avatar and username
  [ticket/9758] Fixed bug in mcp_warn.php
  [ticket/9758] Optimises the html code of avatar image in header
  [ticket/9758] Error because of missing functions_display.php fixed
  [ticket/9758] Removed useless if-conditions to include functions.php
  [ticket/9758] Changes class name of new "span" in overall_header.html
  [ticket/9758] Adds global template variable CURRENT_USER_AVATAR
2014-03-31 20:31:48 +02:00
Joas Schilling
ba84268d4e Merge remote-tracking branch 'crizz0/ticket/9758' into develop-ascraeus
* crizz0/ticket/9758:
  [ticket/9758] Clickable avatar in header and renamed class for avatar-img
  [ticket/9758] Remove unnessary if-question for include functions_display
  [ticket/9758] Slims the line 4775 in includes/functions.php
  [ticket/9758] Adds id and changes filter to fix travis CI test
  [ticket/9758] Removed the needless space after first ENDIF
  [ticket/9758] Adding impr. for overall_header display of avatar and username
  [ticket/9758] Fixed bug in mcp_warn.php
  [ticket/9758] Optimises the html code of avatar image in header
  [ticket/9758] Error because of missing functions_display.php fixed
  [ticket/9758] Removed useless if-conditions to include functions.php
  [ticket/9758] Changes class name of new "span" in overall_header.html
  [ticket/9758] Adds global template variable CURRENT_USER_AVATAR
2014-03-31 20:29:45 +02:00
PayBas
f8b5b71890 [ticket/12333] Add Template Event overall_header_body_after
PHPBB3-12333
2014-03-31 12:27:19 +02:00
Matt Friedman
8ee37def81 [ticket/11962] Resize posted images to fit and give them a class
PHPBB3-11962
2014-03-30 14:19:16 -07:00
Joas Schilling
77f41912db Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [prep-release-3.1.0-b2] Prepare development of 3.1.0-b3
  [prep-release-3.1.0-b2] Add changelog for 3.1.0-b2
  [prep-release-3.1.0-b2] Prepare Changelog
  [prep-release-3.1.0-b2] Add migration for 3.1.0-b2
  [prep-release-3.1.0-b2] Update version to 3.1.0-b2
2014-03-30 23:01:52 +02:00
Joas Schilling
a618710a69 Merge branch 'prep-release-3.1.0-b2' into develop-ascraeus
* prep-release-3.1.0-b2:
  [prep-release-3.1.0-b2] Prepare development of 3.1.0-b3
  [prep-release-3.1.0-b2] Add changelog for 3.1.0-b2
  [prep-release-3.1.0-b2] Prepare Changelog
  [prep-release-3.1.0-b2] Add migration for 3.1.0-b2
  [prep-release-3.1.0-b2] Update version to 3.1.0-b2
2014-03-30 23:01:27 +02:00
Joas Schilling
45f2efea19 [prep-release-3.1.0-b2] Prepare development of 3.1.0-b3 2014-03-30 22:53:09 +02:00
Joas Schilling
120aa3685f [prep-release-3.1.0-b2] Add changelog for 3.1.0-b2 2014-03-30 22:14:54 +02:00
Joas Schilling
d81c5437d1 [prep-release-3.1.0-b2] Prepare Changelog 2014-03-30 22:08:12 +02:00
Joas Schilling
fdbe5e2f42 [prep-release-3.1.0-b2] Add migration for 3.1.0-b2 2014-03-30 22:08:11 +02:00
Joas Schilling
254b7739a8 [prep-release-3.1.0-b2] Update version to 3.1.0-b2 2014-03-30 22:08:10 +02:00
David King
cbd60c38a4 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12326] Correctly format update/index.php and remove php closing tag
  [ticket/12326] Do not add deleted files to the list of changed files
2014-03-30 16:04:37 -04:00
David King
acb4d90371 Merge remote-tracking branch 'nickvergessen/ticket/12326' into develop-ascraeus
* nickvergessen/ticket/12326:
  [ticket/12326] Correctly format update/index.php and remove php closing tag
  [ticket/12326] Do not add deleted files to the list of changed files
2014-03-30 16:03:11 -04:00
Joas Schilling
a1e2d97ae7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12330] Fix create index in db tools on mssql
2014-03-30 19:24:39 +02:00
Joas Schilling
1a6dc6e767 Merge remote-tracking branch 'Elsensee/ticket/12330' into develop-ascraeus
* Elsensee/ticket/12330:
  [ticket/12330] Fix create index in db tools on mssql
2014-03-30 19:24:11 +02:00
Crizzo
fa6c1044b8 [ticket/9758] Clickable avatar in header and renamed class for avatar-img
PHPBB3-9758
2014-03-30 19:13:14 +02:00
Andreas Fischer
297729aa32 [ticket/12318] Use MySQL instead of MySQLi for now on HHVM.
PHPBB3-12318
2014-03-30 15:43:55 +02:00
Andreas Fischer
e1be4943d8 [ticket/12318] Pin HHVM version to 3.0.0~precise.
PHPBB3-12318
2014-03-30 15:43:55 +02:00
Andreas Fischer
d53c411d90 [ticket/12318] Always install new config file on HHVM upgrade conflict.
PHPBB3-12318
2014-03-30 15:43:54 +02:00
Andreas Fischer
a53312636a [ticket/12318] Add PPA providing dependencies for recent HHVM on Ubuntu 12.04.
PHPBB3-12318
2014-03-30 15:43:54 +02:00
Andreas Fischer
672eab3a9c [ticket/12318] Upgrade to a recent stable version of HHVM.
PHPBB3-12318
2014-03-30 15:43:54 +02:00
Andreas Fischer
04707cbf8d [ticket/12318] Correctly setup HHVM for functional tests.
PHPBB3-12318
2014-03-30 15:43:54 +02:00
Oliver Schramm
55c1b49bed [ticket/12330] Fix create index in db tools on mssql
PHPBB3-12330
2014-03-30 15:42:04 +02:00
Andreas Fischer
70e876d5d8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12316] Add Build Status Icon for develop-ascraeus to README.md
2014-03-30 15:40:50 +02:00
Andreas Fischer
570aab34f5 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12316] Add Build Status Icon for develop-ascraeus to README.md
2014-03-30 15:40:42 +02:00
Andreas Fischer
dc3cb2205b Merge remote-tracking branch 'VSEphpbb/ticket/12316' into develop-olympus
* VSEphpbb/ticket/12316:
  [ticket/12316] Add Build Status Icon for develop-ascraeus to README.md
2014-03-30 15:40:30 +02:00
Andreas Fischer
951a289c09 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12321] Remove execute bit from ucp_main_subscribed.html and buttons.png
2014-03-30 15:37:30 +02:00