8954 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Vogel	5635fe250c	Merge remote-tracking branch 'upstream/master'	2012-12-03 08:30:49 +01:00
Michael Vogel	d548d1943f	vier: maximum width of comments defined	2012-12-03 08:29:41 +01:00
friendica	fa90f27b53	Merge https://github.com/friendica/friendica into pull	2012-12-02 13:50:50 -08:00
friendica	79fb5509ed	bug #511 - if birth year supplied but not a month or day, force a sane default. PHP datetime functions don't handle zero very well.	2012-12-02 13:47:41 -08:00
friendica	ee0def3ef5	rev update	2012-12-02 13:47:24 -08:00
Vasya Novikov	480af990ec	added translations where they were empty	2012-12-03 00:14:34 +04:00
Tobias Diekershoff	144200384f	added do not register before import warning to DE move_account help	2012-12-02 07:49:25 +01:00
Thomas Willingham	a9675727b3	Move-account.md - add "do not create a new account first" hint, since this has already caught a couple of people out.	2012-12-01 22:30:03 +00:00
Leberwurscht	945afec656	fix CSRF hole in API	2012-12-01 01:26:54 +01:00
Tobias Diekershoff	daa56a94d3	DE: update to the strings	2012-11-30 09:17:58 +01:00
Tobias Diekershoff	af1ebc932f	FR: update to the strings	2012-11-30 09:17:29 +01:00
friendica	d972ccc408	Merge https://github.com/friendica/friendica into pull	2012-11-28 19:25:47 -08:00
friendica	b130c892b2	features categories were un-translatable	2012-11-28 19:25:09 -08:00
Thomas Willingham	01179e3bb9	Update remove account doco.	2012-11-29 02:53:57 +00:00
Thomas Willingham	785fa1e070	Remove unsupported tag from Darkzero-NS since I have been supporting it.	2012-11-29 02:33:11 +00:00
fermionic	eb37c8cca6	Merge pull request #539 from fermionic/20121127-universal-altpager ... universal altpager	2012-11-28 16:40:26 -08:00
Zach Prezkuta	eb964bbe08	put the correct function with the logic	2012-11-27 19:33:04 -07:00
Zach Prezkuta	aef96a1d5e	add support for admin choice to force an entire hub to use alt-pager	2012-11-27 19:30:46 -07:00
Thomas Willingham	a6e7ad9771	Merge branch 'master' of https://github.com/friendica/friendica	2012-11-27 23:58:00 +00:00
friendica	32868dab79	catch stragglers in "chunked" delivery mode	2012-11-27 15:17:41 -08:00
Thomas Willingham	512729073b	Unmark Diabook experimental	2012-11-27 17:14:13 +00:00
Thomas Willingham	8c3ea4b4d4	Add max_daily_registrations to admin panel.	2012-11-27 17:13:32 +00:00
Thomas Willingham	7de455602c	Revert Diabook.	2012-11-27 16:28:12 +00:00
Thomas Willingham	5d1cbc2677	Remove German Pages.md (replaced with Forums.md)	2012-11-26 06:15:18 +00:00
tobiasd	cced235c04	Merge pull request #538 from balderino/master ... renaming pages to forums (german doc-files)	2012-11-25 22:11:41 -08:00
Thomas Willingham	95322ff5f4	Diabook - of all the things to miss...wall-item-content.	2012-11-26 05:49:13 +00:00
Thomas Willingham	586acbe998	Merge branch 'master' of https://github.com/friendica/friendica	2012-11-26 04:39:08 +00:00
Thomas Willingham	fa5d25ec7a	Diabook - better 1024 resolution support.	2012-11-26 04:38:19 +00:00
friendica	5d904a9fa8	improve performance of photo upload page	2012-11-25 19:34:54 -08:00
friendica	15ede093cf	Merge https://github.com/friendica/friendica into pull	2012-11-25 19:21:24 -08:00
friendica	bb51be4ea8	rev update	2012-11-25 19:21:08 -08:00
Thomas Willingham	b0b4baa331	Diabook - kill wall_thread, remove need for wide variants, fix live updates, add todo list.	2012-11-26 02:11:19 +00:00
balderino	8ac28eec97	update_forums	2012-11-25 19:42:20 +01:00
Tobias Diekershoff	54bcfd2535	PL: update to the strings	2012-11-25 12:57:55 +01:00
Tobias Diekershoff	50aa5face7	DE: update to the strings	2012-11-25 12:57:28 +01:00
Tobias Diekershoff	ae58049110	ZH-CN: Update to the strings	2012-11-25 12:52:18 +01:00
Tobias Diekershoff	569a8edcb0	DE: Move-Account.md translated	2012-11-24 06:33:22 +01:00
Michael Vogel	88f5865738	Vier: Maximum with for content area	2012-11-23 12:15:03 +01:00
friendica	fcbdefcfd5	missing network_to_name	2012-11-22 21:04:03 -08:00
friendica	ff9c19d75a	Merge https://github.com/friendica/friendica into pull	2012-11-22 20:55:03 -08:00
friendica	278f30790a	rev update	2012-11-22 20:54:44 -08:00
friendica	226d1ba7c1	Merge pull request #537 from fermionic/20121121-features ... Port Features from Red	2012-11-22 20:54:16 -08:00
Zach Prezkuta	beec28cc62	found a bug already	2012-11-22 09:34:50 -07:00
Zach Prezkuta	a536a4e657	local stuff leaked	2012-11-22 09:21:21 -07:00
Zach Prezkuta	04f5506318	forgot some slightly important files	2012-11-22 09:20:03 -07:00
Zach Prezkuta	94204d9160	implement features	2012-11-22 09:14:22 -07:00
Michael Vogel	e36c30d285	Vier: Margin problems with code fixed.	2012-11-22 15:06:15 +01:00
friendica	891bfd9f91	further jenkins include fixes	2012-11-22 05:09:28 -08:00
friendica	9835efc9e4	fix jenkins tests	2012-11-22 05:06:15 -08:00
friendica	868bdc9b6a	php warning	2012-11-22 03:19:05 -08:00