22721 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Tobias Diekershoff	fc62c329c5	Merge pull request #1316 from annando/issue-1197 ... Issue 1197: New hook for "oembed_fetch_url"	2015-01-25 08:23:52 +01:00
Tobias Diekershoff	5cb3a0fced	CS update to the strings	2015-01-25 08:21:55 +01:00
Michael Vogel	597ef20b71	"about" and "location" is now included in global contacts as well.	2015-01-25 02:29:46 +01:00
Michael Vogel	cd41746597	Moved the "test" folder to "local"	2015-01-25 01:09:47 +01:00
Michael Vogel	cb9196f6d6	Issue 1197: New hook for "oembed_fetch_url"	2015-01-25 00:58:51 +01:00
Michael Vogel	5639f0448b	Merge pull request #1309 from tobiasd/20150124-defr ... DE + FR: update to the core strings	2015-01-25 00:43:13 +01:00
Michael Vogel	4f2af23122	Merge pull request #1310 from tobiasd/20150124admin ... type email for email field in add user form	2015-01-25 00:42:11 +01:00
Michael Vogel	344210bd6d	Global contacts are now added with reshares as well. Better support for "aboutme" and "location" in poco.	2015-01-25 00:19:59 +01:00
Michael Vogel	58d814b793	issue 1283 - Share-it button support for friendica	2015-01-25 00:10:58 +01:00
Michael Vogel	5c4d55c5e8	Diaspora: Reshares are now working more reliable	2015-01-25 00:01:58 +01:00
Tobias Diekershoff	eaaed02ffd	use type email in users settings as well	2015-01-24 09:40:01 +01:00
Tobias Diekershoff	8b558eb7ea	type email for email field in add user form	2015-01-24 09:30:44 +01:00
Tobias Diekershoff	a33ca89bb7	adding missing styling to the ignore button in quattro	2015-01-24 07:22:55 +01:00
Tobias Diekershoff	c5b8956730	FR update to the strings	2015-01-24 07:05:55 +01:00
Tobias Diekershoff	619f2a86f3	DE update to the strings	2015-01-24 07:05:42 +01:00
Tobias Diekershoff	d3bb944700	making the ignore button in contact suggestions visible in quattro	2015-01-23 09:51:24 +01:00
fabrixxm	f3d49cbfa8	Merge pull request #1304 from tobiasd/20150122 ... updating master message.po and strings.php	2015-01-23 08:29:54 +01:00
Tobias Diekershoff	11f88e15be	update to the master strings	2015-01-22 18:18:31 +01:00
fabrixxm	6e06169565	Merge pull request #1301 from annando/1501-bugfix-var_dump ... Bugfix: Removed test code	2015-01-21 13:15:23 +01:00
Michael Vogel	ee50b04382	Bugfix: Removed test code.	2015-01-21 12:42:34 +01:00
fabrixxm	62998bf8b5	Merge pull request #1300 from annando/1501-better-ostatus ... Improvements for OStatus	2015-01-21 08:18:34 +01:00
Michael Vogel	1f23d691f3	Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus	2015-01-21 01:30:09 +01:00
Michael Vogel	ed037124b3	Merge pull request #1299 from fabrixxm/optional-text-only-email ... Optional text only email	2015-01-20 23:26:44 +01:00
Michael Vogel	184dcf75a7	Caching for scrape, keywords for remote_self, notifications for addresses that aren't in your contact list.	2015-01-20 22:54:25 +01:00
fabrixxm	36724eb8ea	Merge pull request #1298 from tobiasd/20150116installer ... polishing the installer	2015-01-20 22:18:37 +01:00
fabrixxm	816d3f86e7	reword checkbox help text	2015-01-20 22:17:03 +01:00
Tobias Diekershoff	3a3ea18384	typos	2015-01-20 21:23:27 +01:00
fabrixxm	3a0e7e3004	Merge pull request #1297 from tobiasd/20150116vagrantdocs ... added info how to halt the VM to the vagrant docs.	2015-01-20 20:37:17 +01:00
fabrixxm	254968a99c	fix random mime boundary generation ... second and third random numbers in mime boundary was alwasy 10000000000	2015-01-20 19:21:49 +01:00
fabrixxm	b2527039b7	add text-only email option ... add a checkbok to notification settings. if checked, html body is not added to email.	2015-01-20 19:19:58 +01:00
Tobias Diekershoff	c5200f9327	profile edit homepage field type URL	2015-01-19 08:15:20 +01:00
Tobias Diekershoff	b1b1fe495b	some documentation for the templating engine and basic templates for forms	2015-01-18 16:15:37 +01:00
Tobias Diekershoff	d58bac1138	template for password now support required and autofocus	2015-01-16 19:36:09 +01:00
Tobias Diekershoff	3483cd35f8	use HTML5 attributes in the installer wizard	2015-01-16 19:32:31 +01:00
Tobias Diekershoff	8b20af6ef5	template for input fields now supports required, autofocus and types email, url	2015-01-16 19:31:23 +01:00
Tobias Diekershoff	80abd1bd41	added info how to halt the VM to the vagrant docs.	2015-01-16 11:20:48 +01:00
Tobias Diekershoff	c86d459b1d	Merge pull request #1296 from ddorian1/develop ... Fix network tab urls	2015-01-16 07:58:04 +01:00
Tobias Diekershoff	c184dccc11	Merge pull request #1295 from fabrixxm/issue-1286 ... api: call hook 'authenticate' from api_login()	2015-01-16 07:56:53 +01:00
Johannes Schwab	9cb3a4188e	fix network tab urls	2015-01-16 02:25:17 +01:00
fabrixxm	b45a4b398b	api: call hook 'authenticate' from api_login()	2015-01-15 18:15:06 +01:00
fabrixxm	d597fb6b5a	Merge pull request #1292 from silke/develop ... Script now installs missing add-apt-repository tool.	2015-01-15 10:15:50 +01:00
Tobias Diekershoff	3fa4c355dd	Merge pull request #1293 from silke/vagrant-docs ... Added more explanation to developing with Vagrant	2015-01-14 19:06:21 +01:00
Silke Meyer	f6b8553d3e	Added more explanation to developing with Vagrant	2015-01-14 18:32:10 +01:00
Silke Meyer	86623bcdae	Script now installs missing add-apt-repository tool.	2015-01-14 17:57:25 +01:00
fabrixxm	9570c2894c	Merge pull request #1291 from silke/docs ... Update docs	2015-01-14 14:58:46 +01:00
Silke Meyer	ce259c1cc7	Updated "Tips for new members" section	2015-01-14 14:05:21 +01:00
Silke Meyer	ddff2e0da0	Removed part about sponsored bugs.	2015-01-14 13:50:01 +01:00
Michael Vogel	7d34648373	Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus	2015-01-12 20:49:00 +01:00
Tobias Diekershoff	e03a5ec761	Merge pull request #1287 from annando/1501-poci-with-location ... Poco now shows "about" and the location as well	2015-01-12 07:35:42 +01:00
Michael Vogel	beaca70126	OStatus: Replies now arrive their target.	2015-01-12 00:14:51 +01:00