11899 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Tobias Diekershoff	64595e9a2d	Merge pull request #2481 from annando/1604-probe_url ... Use data from contact and gcontact prior to probe_url	2016-04-26 06:47:12 +02:00
Tobias Diekershoff	d049ffa96c	Merge pull request #2483 from annando/1604-cookie ... "remember me" should work now reliable	2016-04-26 06:45:20 +02:00
Tobias Diekershoff	9ec9ea3844	Merge pull request #2484 from rabuzarus/25.04_login_template ... login: use ARIA instead of <fieldset> tag	2016-04-26 06:43:48 +02:00
rabuzarus	7e199c72ac	login: use ARIA instead of <fieldset> tag	2016-04-25 23:40:07 +02:00
Michael Vogel	ca72c5f256	Merge remote-tracking branch 'upstream/develop' into 1604-cookie	2016-04-25 22:25:13 +02:00
Michael Vogel	e98a670f50	Merge pull request #2482 from rabuzarus/2604_vier_mobile_embedded_video ... vier-mobile: expand embedded video on play	2016-04-25 22:24:08 +02:00
rabuzarus	9943d4a60a	vier-mobile: expand embedded video on play	2016-04-25 22:12:53 +02:00
Michael Vogel	18aa43e6f6	Code redesign and comments	2016-04-25 22:10:45 +02:00
Michael Vogel	1f4f60a82d	Merge pull request #2480 from rabuzarus/2504_vier_mobile_fix ... vier mobile fixes	2016-04-25 21:41:43 +02:00
Michael Vogel	cd92521c1d	Remove test code	2016-04-25 21:39:54 +02:00
Michael Vogel	1aa6c1dc5b	Use data from contact and gcontact prior to probe_url	2016-04-25 21:35:42 +02:00
Michael Vogel	2c75a0fefc	Minor session stuff	2016-04-25 20:43:40 +02:00
rabuzarus	4daa9a50f5	vier-mobile: little css fix	2016-04-25 20:30:02 +02:00
rabuzarus	fa66fa9b28	vier-mobile: fix embedded video for tablets and bigger	2016-04-25 20:24:36 +02:00
Tobias Diekershoff	714eb1a296	Merge pull request #2479 from annando/1604-vier-login ... Vier: No visible login border/no search and events without login	2016-04-25 20:24:10 +02:00
rabuzarus	7b48ef23d5	vier-mobile: fix embedded video and embedded link images for tablets and bigger	2016-04-25 20:04:10 +02:00
rabuzarus	c553ab9b46	vier-mobile: fix threaded view for tablets and bigger	2016-04-25 19:54:03 +02:00
Michael Vogel	f0d5c97c08	Merge remote-tracking branch 'upstream/develop' into 1604-cookie	2016-04-25 16:44:06 +02:00
Michael Vogel	75fefeba95	Only hide the search if "local_search" was activated.	2016-04-25 16:42:16 +02:00
Tobias Diekershoff	af37fa8293	Merge pull request #2478 from annando/1604-bookmarks ... Bugfix DFRN and bookmark detection	2016-04-25 14:52:03 +02:00
Michael Vogel	8c2a4fe02a	We now work with a hash to avoid cookie manipulation	2016-04-25 11:19:42 +02:00
Michael Vogel	a214fc798a	"Remember Me" should work now but needs more fine tuning	2016-04-25 07:10:40 +02:00
Michael Vogel	b4369d51f5	Improved "remember me" functionality	2016-04-25 00:02:43 +02:00
Michael Vogel	0c5f315294	Vier: No visible login border/no search and events without login	2016-04-24 21:45:06 +02:00
Michael Vogel	93347d3279	Bugfix DFRN and bookmark detection	2016-04-24 17:00:19 +02:00
Tobias Diekershoff	1756ecaba3	Merge pull request #2476 from annando/1604-poller-maxlevel ... Value to define the maximum level of database connections for the worker	2016-04-23 11:35:43 +02:00
Tobias Diekershoff	c7bf440a2c	Merge pull request #2477 from annando/1604-gcontact-update ... Check the global contacts every 90 days/Better handling in item creation	2016-04-23 11:09:12 +02:00
Michael Vogel	5711e561fc	Check the global contacts every 90 days/Better handling in item creation	2016-04-23 10:46:16 +02:00
Michael Vogel	76b24f61a9	New (experimental) value to define the maximum level of database connections for the worker	2016-04-23 10:11:09 +02:00
Tobias Diekershoff	76c04e6782	Merge pull request #2474 from annando/1604-hubzilla-quickfix ... Quickfix for Hubzilla systems with enabled OStatus addon	2016-04-23 06:49:29 +02:00
Tobias Diekershoff	aac046c91b	Merge pull request #2475 from annando/1604-avoid-write-operations ... Avoid write operations if not needed	2016-04-23 06:48:45 +02:00
Michael Vogel	68bff2707e	Merge pull request #2473 from tobiasd/20160422-es ... ES translations thx TupambaeNet	2016-04-23 00:21:48 +02:00
Michael Vogel	ca2454eeb4	Avoid write operations if not needed	2016-04-23 00:06:34 +02:00
Michael Vogel	e76475d81f	Quickfix for Hubzilla systems with enabled OStatus addon	2016-04-22 23:58:06 +02:00
Tobias Diekershoff	031f6cbf64	ES translations thx TupambaeNet	2016-04-22 17:33:39 +02:00
Tobias Diekershoff	19a24d6ada	Merge pull request #2470 from annando/1604-gprobe ... Some gcontact stuff and DDoS/Spam prevention	2016-04-21 08:40:52 +02:00
Tobias Diekershoff	778935eb48	Merge pull request #2471 from annando/1604-diaspora-always-on ... Diaspora: Comments and Likes are now signed at any time	2016-04-21 08:39:42 +02:00
Michael Vogel	5eb6b75645	Clean the url at "poco"	2016-04-21 07:24:00 +02:00
Michael Vogel	ee72f1e4bd	Merge pull request #2468 from tobiasd/2242-and-htconfig ... stuff for the installer and htconfig template	2016-04-21 06:41:02 +02:00
Michael Vogel	e333efc9aa	Diaspora: Comments and Likes are now signed at any time	2016-04-20 23:27:33 +02:00
Michael Vogel	8da91a2298	Improved DDoS detection	2016-04-20 22:10:05 +02:00
Michael Vogel	0434b0485a	Start a gcontact probing for new gcontacts	2016-04-20 21:47:57 +02:00
Tobias Diekershoff	caa541f939	make doxygen a bit more happy	2016-04-20 16:08:17 +02:00
Tobias Diekershoff	6601582a12	make doxygen a bit more happy	2016-04-20 16:06:39 +02:00
Tobias Diekershoff	f075c8d410	Merge pull request #2469 from rabuzarus/2004_rss_poll ... fix: contact edit poll_interval wasn't submitted	2016-04-20 15:47:05 +02:00
rabuzarus	7ee9c536ee	fix: contact edit poll_interval wasn't submitted	2016-04-20 15:37:34 +02:00
Tobias Diekershoff	7c6ebae5c0	reorganize the htconfig template	2016-04-20 14:30:22 +02:00
Tobias Diekershoff	d3293dfcf2	during installation choose the highest RINO version possible	2016-04-20 14:17:48 +02:00
Tobias Diekershoff	8c8e635d2e	Merge pull request #2467 from annando/1604-gcontact-cleanup ... Some more checks that the gcontact table contains valid data	2016-04-20 14:14:35 +02:00
Michael Vogel	378d444fc3	Only do the cleaning on specific networks	2016-04-20 09:38:06 +02:00