Commit graph

20403 commits

Author SHA1 Message Date
Matt Friedman
7c0e839fe3 [ticket/11936] Add no_avatars to UCP list Notifications too
PHPBB3-11936
2013-10-16 17:33:01 -07:00
Matt Friedman
25f287a991 [ticket/11936] Use "no_avatar.gif" if needed in Notification window 2013-10-16 17:23:25 -07:00
Matt Friedman
b7f1f3d38f [ticket/11936] Restyle the notification text (no underline/decoration)
PHPBB3-11936
2013-10-16 17:22:02 -07:00
Matt Friedman
cc884be593 [ticket/11936] Fix Avatar overflow issue in Notification window
PHPBB3-11936
2013-10-16 17:21:22 -07:00
Nathan Guse
852b707b48 Merge pull request #1781 from VSEphpbb/ticket/11921
Ticket/11921 - Streamline PMs and Notifications in Header Link List
2013-10-16 10:50:17 -07:00
Matt Friedman
ab8ac5e284 [ticket/11921] Directly inject unread messages count into the template
PHPBB3-11921
2013-10-16 10:26:33 -07:00
Matt Friedman
bd58c31ee0 [ticket/11921] Only get the count of unread PMs
PHPBB3-11921
2013-10-16 10:08:29 -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
Nathan Guse
d062402c4b [ticket/11902] Prevent errors if set_time_limit disabled
PHPBB3-11902
2013-10-16 11:08:33 -05:00
Joas Schilling
91eeebfb07 [ticket/11924] Remove duplicated code
PHPBB3-11924
2013-10-16 16:38:22 +02:00
Joas Schilling
3c9a8a3788 [ticket/11924] Fix some minor issues with the php event docs
PHPBB3-11924
2013-10-16 16:32:40 +02:00
Joas Schilling
e04a06ab94 [ticket/11924] Add option to export php event list
PHPBB3-11924
2013-10-16 16:32:00 +02:00
Andreas Fischer
ecc756e12e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11920] Print MariaDB version after successful setup.
  [ticket/11920] Manually purge mysql-common.
  [ticket/11920] Actually call travis/setup-mariadb.sh.
2013-10-16 02:17:11 +02:00
Nils Adermann
16ab35c1b5 Merge pull request #1782 from bantu/ticket/11920
[ticket/11920] Actually call travis/setup-mariadb.sh.
2013-10-15 16:34:32 -07:00
Joas Schilling
a03965554e [ticket/11924] Reduce unneccessary load
PHPBB3-11924
2013-10-16 00:48:51 +02:00
Joas Schilling
fa5fdc53b6 [ticket/11924] Add version info of template events to events.md
PHPBB3-11924
2013-10-16 00:45:28 +02:00
Joas Schilling
9cf634e517 [ticket/11924] Add script to export events.md with wiki markup
PHPBB3-11924
2013-10-16 00:39:52 +02:00
Joas Schilling
5f788e40d8 [ticket/11924] Bring layout of events.md to one style
PHPBB3-11924
2013-10-16 00:37:54 +02:00
Andreas Fischer
5a481bb176 [ticket/11920] Print MariaDB version after successful setup.
PHPBB3-11920
2013-10-16 00:25:07 +02:00
Andreas Fischer
0f64f0edc4 [ticket/11920] Manually purge mysql-common.
PHPBB3-11920
2013-10-16 00:24:44 +02:00
Joas Schilling
7afff1e5bd Merge pull request #1783 from bantu/ticket/11926
[ticket/11926] Fix plupload migration dependency.
2013-10-15 15:04:38 -07:00
Andreas Fischer
2adbd08714 [ticket/11926] Fix plupload migration dependency.
PHPBB3-11926
2013-10-16 00:02:51 +02:00
Matt Friedman
457ca9c763 [ticket/11921] Remove "l_" from non-lang variables
PHPBB3-11921
2013-10-15 14:09:47 -07:00
Joas Schilling
3bb93ab2d3 [develop] Update version to 3.1.0-a2-dev 2013-10-15 22:46:02 +02:00
Andreas Fischer
878cb836f5 [ticket/11920] Actually call travis/setup-mariadb.sh.
PHPBB3-11920
2013-10-15 22:44:49 +02:00
Nils Adermann
437d38bc05 Merge remote-tracking branch 'github-phpbb/develop-olympus' into develop
* github-phpbb/develop-olympus:
  [ticket/11920] Have to use empty root password otherwise db creation fails.
  [ticket/11920] Add MariaDB environment to Travis-CI.

Conflicts:
	.travis.yml
2013-10-15 13:36:42 -07:00
Nils Adermann
8131700330 Merge pull request #1780 from bantu/ticket/11920
[ticket/11920] Add MariaDB environment to Travis-CI.
2013-10-15 13:34:51 -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
Joas Schilling
3521dfc278 Merge remote-tracking branch 'p/prep-release-3.1.0-a1' into develop
* p/prep-release-3.1.0-a1:
  [prep-release-3.1.0-a1] Update changelog with the latest changes
  [ticket/11919] Remove extra argument to notification manager's sql_fetchfield()
  [ticket/11918] Make sql_freeresult() consistent across all DB drivers
  [prep-release-3.1.0-a1] Only build packages for the latest olympus versions
  [prep-release-3.1.0-a1] Update changelog with 3.1.0-a1 changes
  [prep-release-3.1.0-a1] Update version to 3.1.0-a1
2013-10-15 18:40:43 +02:00
Andreas Fischer
55e24eb4f8 [ticket/11920] Have to use empty root password otherwise db creation fails.
PHPBB3-11920
2013-10-15 16:57:16 +02:00
Andreas Fischer
cdaea7a406 [ticket/11920] Add MariaDB environment to Travis-CI.
PHPBB3-11920
2013-10-15 16:28:59 +02:00
Joas Schilling
a35721f68c [prep-release-3.1.0-a1] Update changelog with the latest changes 2013-10-15 15:46:11 +02:00
Joas Schilling
532b124115 Merge remote-tracking branch 'noxwizard/ticket/11919' into prep-release-3.1.0-a1
* noxwizard/ticket/11919:
  [ticket/11919] Remove extra argument to notification manager's sql_fetchfield()
2013-10-15 15:41:09 +02:00
Joas Schilling
8dc824d4b3 Merge remote-tracking branch 'noxwizard/ticket/11918' into prep-release-3.1.0-a1
* noxwizard/ticket/11918:
  [ticket/11918] Make sql_freeresult() consistent across all DB drivers
2013-10-15 15:39:12 +02:00
Patrick Webster
2b1ee16e4f [ticket/11919] Remove extra argument to notification manager's sql_fetchfield()
PHPBB3-11919
2013-10-14 21:18:41 -05:00
Patrick Webster
76ddf1ca41 [ticket/11918] Make sql_freeresult() consistent across all DB drivers
PHPBB3-11918
2013-10-14 16:37:23 -05:00
Marc Alexander
87bd628241 [feature/passwords] Minor cleanup in passwords files
PHPBB3-11610
2013-10-14 14:31:00 +02:00
Joas Schilling
7a46976a78 [prep-release-3.1.0-a1] Only build packages for the latest olympus versions 2013-10-14 12:21:54 +02:00
Joas Schilling
a953a65b6c [prep-release-3.1.0-a1] Update changelog with 3.1.0-a1 changes 2013-10-14 12:08:00 +02:00
Joas Schilling
4709cbbed3 [prep-release-3.1.0-a1] Update version to 3.1.0-a1 2013-10-14 12:04:18 +02: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
Nils Adermann
5927f0dbf2 Merge pull request #1582 from bantu/feature/plupload/cron
[ticket/10929] Cron Job for Plupload Upload Directory Cleaning
2013-10-13 16:00:43 -07:00
Nils Adermann
b9ca3dc354 Merge pull request #1581 from bantu/feature/plupload/deps
[ticket/10929] Plupload dependencies
2013-10-13 16:00:33 -07:00
Fyorl
9f1c627988 [feature/plupload/integration] Add missing javascript file.
PHPBB3-10929
2013-10-14 00:52:37 +02:00
Nils Adermann
5f82eccc44 Merge pull request #1776 from bantu/ticket/11913
[ticket/11913] Better download.phpbb.com directory structure for phpBB 3...
2013-10-13 15:22:01 -07:00
Andreas Fischer
7e96b663f1 [ticket/11913] Better download.phpbb.com directory structure for phpBB 3.1+
PHPBB3-11913
2013-10-14 00:15:10 +02:00
David King
1769135eaf Merge pull request #1766 from bantu/ticket/11621
[ticket/11621] Improve MySQL fulltext search indexes
2013-10-13 13:45:41 -07:00
Marc Alexander
61f60d395a [feature/passwords] Use passwords manager service instead of functions
The old functions phpbb_hash() and phpbb_check_hash() have been replaced with
the passwords manager service in all front-end related files. The phpBB2
converter and the release_3_0_5_rc1 migration file have not been changed.
The same applies to the security/hash_test that still tests the function
phpbb_check_hash(). This will however make sure that the old function
still works.

PHPBB3-11610
2013-10-13 16:32:37 +02:00
Marc Alexander
e674313559 [feature/passwords] Use passwords.manager service in login_forum_box()
Additionally, unused variables have been removed from the globals and
the request class is now used instead of the request_var() function.

PHPBB3-11610
2013-10-13 16:09:55 +02:00