16344 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
redmatrix	b4c1baada1	Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge	2016-04-03 16:16:14 -07:00
redmatrix	1ca3eeedff	issue #337	2016-04-03 16:15:41 -07:00
Mario Vavti	298b53e93a	Merge branch 'master' into dev	2016-04-03 18:00:25 +02:00
Mario Vavti	f13096a6f3	various fixes	2016-04-03 18:00:03 +02:00
Mario Vavti	470f14b919	Merge branch 'master' into dev	2016-04-03 15:27:26 +02:00
Mario Vavti	53311a30ad	reduce chat-item-title fontsize to match wall-item-ago	2016-04-03 15:27:10 +02:00
Mario Vavti	5634a4bb61	Merge branch 'master' into dev	2016-04-03 14:56:52 +02:00
Mario Vavti	738e14348d	update upstream libs fullcalendar and moment to a recent version	2016-04-03 14:56:19 +02:00
Mario Vavti	787e2ef961	Merge branch 'master' into dev	2016-04-03 12:20:10 +02:00
Mario Vavti	db4e9aeaad	fullscreen mode for events	2016-04-03 12:19:49 +02:00
Mario Vavti	7850b04853	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2016-04-03 11:35:47 +02:00
Mario Vavti	b6f18a9a0b	Merge branch 'master' into dev	2016-04-03 11:35:06 +02:00
Mario Vavti	b8d8be7013	show chat expiration time in overview and minor fixes	2016-04-03 11:34:07 +02:00
redmatrix	84feff9500	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2016-04-02 21:09:05 -07:00
redmatrix	81ba293561	Merge branch 'master' into dev	2016-04-02 21:07:34 -07:00
redmatrix	8b3c099a12	use constant	2016-04-02 21:06:41 -07:00
Mario Vavti	2772a72095	ge branch 'master' into dev	2016-04-03 00:19:30 +02:00
Mario Vavti	e361ee9253	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2016-04-03 00:04:30 +02:00
Mario Vavti	3edd4ce78f	ease transition between fullscreen and inline view for small screens	2016-04-03 00:04:05 +02:00
redmatrix	381cc3e6f8	Merge branch 'master' into dev	2016-04-02 13:54:49 -07:00
redmatrix	d09694587d	typo in router	2016-04-02 13:52:16 -07:00
redmatrix	63451db3f6	small changes in README.md	2016-04-02 01:47:46 -07:00
redmatrix	7660afdb0f	revup	2016-04-02 00:28:51 -07:00
jeroenpraat	72d995d35f	Update nl and es-es strings	2016-04-01 23:24:13 +02:00
redmatrix	2a32df75f1	Merge https://github.com/redmatrix/hubzilla into pending_merge	2016-04-01 03:27:46 -07:00
redmatrix	e16da7a166	unreferenced app member	2016-04-01 03:27:21 -07:00
Mario Vavti	5b55726a93	on update only jump to bottom if we actually got a new message	2016-04-01 11:13:04 +02:00
Mario Vavti	bbe93d0e1d	scroll chat to bottom on fullscreen toggle	2016-04-01 10:29:58 +02:00
Mario Vavti	5dd422e2d8	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2016-04-01 10:20:26 +02:00
Mario Vavti	a564f495a7	improve scroll to bottom in chat	2016-04-01 10:20:10 +02:00
redmatrix	995555f357	ditto for typohelper	2016-04-01 01:04:37 -07:00
redmatrix	40f3857691	change call to App::init() to bring back include path (only in typocheck)	2016-04-01 01:02:03 -07:00
redmatrix	5d884c2f3d	suddenly we have includepath issues - provide the explicit paths	2016-04-01 00:59:30 -07:00
redmatrix	8f006a98c4	primary hub change	2016-04-01 00:54:23 -07:00
Mario Vavti	ebac0bdcca	Chat Rooms -> Chatrooms	2016-04-01 09:46:41 +02:00
Mario Vavti	3575ef8a39	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2016-04-01 08:57:05 +02:00
Mario Vavti	60bb8f25f7	move fullscreen js code to redbasic.js where it belongs to	2016-04-01 08:56:51 +02:00
redmatrix	2d3dd673e4	Merge https://github.com/redmatrix/hubzilla into pending_merge	2016-03-31 23:41:41 -07:00
redmatrix	9d47de65d9	undeclared static vars	2016-03-31 23:41:20 -07:00
Mario Vavti	c6d9100649	missing template	2016-04-01 08:36:02 +02:00
redmatrix	44283dbbbb	change the App constructor	2016-03-31 20:24:30 -07:00
redmatrix	0cda431456	create miniApp to convert existing settings files to the static App class	2016-03-31 20:15:47 -07:00
redmatrix	bbfe4de310	increment std_version	2016-03-31 18:57:44 -07:00
redmatrix	36b388ab8c	issue #336	2016-03-31 18:53:05 -07:00
redmatrix	c0b3d7e1b4	Merge branch 'static'	2016-03-31 17:32:51 -07:00
redmatrix	9abd95fad3	static App	2016-03-31 16:06:03 -07:00
Mario Vavti	50d9b29347	slightly change the way fullscreen works and bring it to mod mail	2016-04-01 00:16:39 +02:00
Mario Vavti	90a5ba01a3	make fullscreen mode available for other modules and some cleanup	2016-03-31 23:13:40 +02:00
Mario Vavti	6c2673ae2a	various fixes regarding mod chat	2016-03-31 22:42:28 +02:00
redmatrix	256c228efd	initial conversion to static app class	2016-03-31 13:00:04 -07:00