5017 commits

Author	SHA1	Message	Date
jeroenpraat	e51035ba9a	String update es-es and nl. Plus some extra bits, incl .gitignore update with pageheader.html	2016-01-10 20:45:39 +01:00
Einer von Vielen	51f34b6b07	indexed	2016-01-10 18:24:15 +01:00
redmatrix	93565ea768	features management page for hubmins	2016-01-06 13:01:28 -08:00
Wave	c3e2505b66	Merge pull request #248 from wave72/master ... Updated Italian strings	2016-01-04 14:26:09 +01:00
Paolo Tacconi	c7cc595906	Updated Italian strings	2016-01-04 14:18:52 +01:00
jeroenpraat	9e6f43e3ff	added some real examples for the default-permission-role in de docu. also updated comanche template redable and another css class to tpl file	2016-01-03 21:56:39 +01:00
redmatrix	5b0a17359d	Provide the ability for a hub admin to specify a default permissions role for the first channel created by a new account. This simplifies channel creation by restricting the available options at registration time. The restriction is not applied to any additional channels created under the same account; and in any event can be changed immediately after channel creation, if desired.	2016-01-02 23:39:57 -08:00
jeroenpraat	1ad90b8662	Update es+nl strings and added title on hover for items (needed to view titles that are cut-off)	2016-01-02 15:14:30 +01:00
redmatrix	c38edfcb32	issue #241 (redmatrix issue 405)	2016-01-01 16:12:43 -08:00
jeroenpraat	405725875d	nl+es-es string update	2015-12-29 22:09:47 +01:00
Andrew Manning	3d6359f2e7	Removed defunct URL from old auto-update idea	2015-12-26 16:20:56 -05:00
redmatrix	31fbd19c86	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-12-25 14:32:16 -08:00
redmatrix	a085f4df7f	regression: default inherited permission was not being set for a connection if the permission was 'inherited'. We need to set these so that if somebody changes the top level permissions they don't have to go back and manually edit every connection to allow/deny what used to be an automatic inherited setting.	2015-12-25 14:25:58 -08:00
jeroenpraat	cd2c6779b7	update es-es strings	2015-12-25 17:37:05 +01:00
redmatrix	d39cd088a1	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-12-24 14:41:47 -08:00
jeroenpraat	7d5e066056	After reading and talking with experts I came to the conclusion that es-es and es-419 (and such) dont differ that much. Latin-American Spanish (es-419) is a good idea, but we are not in a rush. So linked es to es-es. That's the proper way to do. See also https://github.com/redmatrix/hubzilla/issues/234#issuecomment-167117960	2015-12-24 15:29:52 +01:00
jeroenpraat	ba920260b8	reverted my previous commit. this is going to be fixed remotely upstream. Meanwhile es points to .es-419. See https://github.com/redmatrix/hubzilla/issues/234#issuecomment-166961958.	2015-12-23 19:18:46 +01:00
jeroenpraat	2988d96cf0	Spanish language codes. See issue #234	2015-12-23 16:41:22 +01:00
redmatrix	36717e5f32	start on refactor of plugin/theme/widget info block parsing	2015-12-22 19:53:00 -08:00
jeroenpraat	4dff54bcb8	update es+nl strings	2015-12-22 19:29:52 +01:00
redmatrix	f23e8f8d41	merge hell	2015-12-20 14:55:43 -08:00
Haakon Meland Eriksen	6409237b29	Updated Norwegian strings for Hubzilla	2015-12-20 14:42:14 +01:00
Haakon Meland Eriksen	1cfb83f003	Merge remote-tracking branch 'upstream/master'	2015-12-20 14:09:30 +01:00
Wave	e2692a4baa	Merge pull request #230 from wave72/master ... Updated Italian strings	2015-12-20 10:17:55 +01:00
wave72	474a1267d7	Updated Italian strings	2015-12-20 10:08:43 +01:00
Haakon Meland Eriksen	628e565a6c	Merge remote-tracking branch 'upstream/master'	2015-12-18 16:04:07 +01:00
Mario Vavti	f78e9001f3	fix search item attachment rendering	2015-12-17 19:39:26 +01:00
zottel	020fea3031	update to German strings	2015-12-16 14:00:23 +01:00
Wave	871ee0f571	Merge pull request #222 from wave72/master ... Updated Italian strings	2015-12-16 09:13:40 +01:00
Paolo Tacconi	933e105f32	Updated Italian strings	2015-12-16 09:00:27 +01:00
jeroenpraat	5a59cd9b8c	Invitation only added to the admin site page. Plus css wrapper class to docu search.	2015-12-15 21:00:40 +01:00
Haakon Meland Eriksen	3b1ab5e79c	Merge remote-tracking branch 'upstream/master'	2015-12-14 18:55:43 +01:00
jeroenpraat	04d3ac9aaf	es+nl strings update	2015-12-12 17:01:43 +01:00
Haakon Meland Eriksen	565126a888	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	2015-12-12 10:00:15 +01:00
Haakon Meland Eriksen	e7d9863432	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	2015-12-11 19:40:09 +01:00
Haakon Meland Eriksen	b9af0645c2	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	2015-12-11 19:34:29 +01:00
redmatrix	f73c82632f	some minor cleanup - change the default of the discover tab (public stream access)	2015-12-10 19:18:55 -08:00
Haakon Meland Eriksen	d86bc0b6cf	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	2015-12-10 20:43:32 +01:00
Haakon Meland Eriksen	e01d4f289b	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	2015-12-10 07:27:42 +01:00
jeroenpraat	47f7165b07	Some work on the login, register and default home page. Mostly neatly centering things on different viewport widths. Bluegrid schema updated.	2015-12-09 23:41:37 +01:00
jeroenpraat	2e73e6bfb6	Fix #109.	2015-12-09 14:37:14 +01:00
Haakon Meland Eriksen	6a3995014e	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	2015-12-09 07:38:58 +01:00
Haakon Meland Eriksen	534a537319	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	2015-12-09 07:31:18 +01:00
Haakon Meland Eriksen	10eefc4eed	Hubzilla textbox - promoting Hubzilla features in jot.tpl - second version	2015-12-09 07:28:55 +01:00
Haakon Meland Eriksen	3d4b3b6a92	Hubzilla textbox - promoting Hubzilla features in jot.tpl	2015-12-09 07:19:31 +01:00
redmatrix	29ac533cc9	remove some unused stuff	2015-12-08 16:32:06 -08:00
redmatrix	b9f5076cfc	move the diaspora templates out of core (except for diaspora_vcard, which is still stuck here for the present time)	2015-12-07 19:17:40 -08:00
jeroenpraat	96d94551f9	update es+nl	2015-12-07 21:10:36 +01:00
Mario Vavti	68cbebe1a5	mod_mitem.js is obsolete	2015-12-07 20:28:17 +01:00
Mario Vavti	293df6308c	some style.css janitor work	2015-12-07 18:57:03 +01:00
Mario Vavti	af29822f04	override bs default margin	2015-12-07 15:45:21 +01:00
Mario Vavti	69c9f4588c	make justify gallery work with more than one albums per page (eg album widget)	2015-12-07 12:13:51 +01:00
Mario Vavti	c8c9916b59	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2015-12-07 00:01:03 +01:00
Mario Vavti	5490919557	css fixes for blockquote and code (use same padding)	2015-12-07 00:00:47 +01:00
redmatrix	a88ec1b1af	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-12-06 14:22:55 -08:00
Mario Vavti	78a70fed2f	fix css issue in directory	2015-12-06 16:37:57 +01:00
redmatrix	9dfe5dee64	change text "Red developers" in update failed email	2015-12-05 13:56:32 -08:00
Haakon Meland Eriksen	7119976199	Merge remote-tracking branch 'upstream/master'	2015-12-05 11:26:07 +01:00
Haakon Meland Eriksen	dd7edc8ced	Updated Norwegian translation	2015-12-05 11:25:36 +01:00
Andrew Manning	0bb7589418	Enlarge the default mail composition text area.	2015-12-04 15:29:57 -05:00
jeroenpraat	bc0e415926	es+nl and bluegrid update	2015-12-03 00:01:51 +01:00
Mario Vavti	c48965ea2f	fix nav search popup active background color	2015-12-02 22:58:38 +01:00
Mario Vavti	593423434c	fix attachment rendering for mail	2015-12-02 09:44:25 +01:00
Mario Vavti	78e18fcdcf	fix badge padding in narrow navbar	2015-12-01 13:28:50 +01:00
Mario Vavti	706598313e	make narrow navbar setting work again	2015-12-01 13:18:08 +01:00
Wave	de1abf9981	Merge pull request #201 from wave72/master ... Updated Italian strings	2015-11-30 16:29:16 +01:00
Paolo Tacconi	c69f6ca1f4	Updated Italian strings	2015-11-30 16:25:24 +01:00
Mario Vavti	7db86a4e05	css fixes	2015-11-28 14:47:17 +01:00
Mario Vavti	122d7281f7	fix tpl if clause	2015-11-28 11:04:33 +01:00
Mario Vavti	fce1dc083b	add templates	2015-11-27 22:53:36 +01:00
Mario Vavti	bcfa72ed31	move events tools to aside widget	2015-11-27 22:45:28 +01:00
Mario Vavti	b92cc852d1	css fixes	2015-11-27 21:44:02 +01:00
Mario Vavti	e569f5d6eb	unset does not work in webkit browsers	2015-11-27 14:00:37 +01:00
Mario Vavti	ee153f64d4	add spinner to events	2015-11-27 13:32:20 +01:00
Mario Vavti	a73c385831	lost calendar icon	2015-11-26 23:29:49 +01:00
Mario Vavti	91b35c5349	various css fixes	2015-11-26 23:19:06 +01:00
Mario Vavti	056db37c66	beautify event item code	2015-11-26 22:14:20 +01:00
Mario Vavti	5cb71fa5da	default timepicker to 15 min steps. abbr -> span	2015-11-26 21:00:04 +01:00
Mario Vavti	8a269823d2	improve event rendering	2015-11-26 20:53:42 +01:00
Mario Vavti	c407e72dcc	add location	2015-11-26 16:40:40 +01:00
Mario Vavti	8e3b796a2f	fix event rendering	2015-11-26 16:38:14 +01:00
Mario Vavti	17e7b276f6	we also need nofinish in the object. css fices	2015-11-26 14:45:22 +01:00
Mario Vavti	306ce3819e	css fixes	2015-11-26 14:16:35 +01:00
Mario Vavti	c7cbd41c16	first iteration on the event item	2015-11-26 12:26:27 +01:00
redmatrix	41542e6886	document that you probably shouldn't set a primary directory server in somebody else's realm.	2015-11-25 17:34:03 -08:00
redmatrix	192e85ffa4	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-11-25 15:14:20 -08:00
redmatrix	b334201797	removed block style on dropdown contact name and details, added dropdown-menu-img-sm on nav search dropdown; as many dropdowns were unuseable	2015-11-25 15:12:54 -08:00
Mario Vavti	3ea84d7eab	some basic event styling	2015-11-25 22:55:07 +01:00
Mario Vavti	a80c45940e	add a if clause for the case we do not have a finish date	2015-11-25 19:02:48 +01:00
Mario Vavti	ab71e33d83	note to self: do not make things more complicated than they need to be.	2015-11-25 17:28:26 +01:00
Mario Vavti	fe57e7059b	events: make sure default finish date is one hour after start date and shift the finishdate if startdate is shifted	2015-11-25 15:05:21 +01:00
Mario Vavti	74a40adece	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2015-11-24 19:18:52 +01:00
Mario Vavti	1767a07f4d	efent form template fixes	2015-11-24 19:18:26 +01:00
Wave	af7549d2f6	Merge pull request #187 from wave72/master ... Updated Italian strings	2015-11-24 17:02:58 +01:00
Paolo Tacconi	e785b723aa	Updated Italian strings	2015-11-24 16:50:12 +01:00
Mario Vavti	f520cd92d0	open form on dbl-click	2015-11-24 14:33:23 +01:00
Mario Vavti	987619130b	some event heavy lifting - please test and report issues	2015-11-24 14:15:28 +01:00
redmatrix	8c5203f7e1	issue #185 - prevent liveUpdate from updating while the built-in html5 media player is "active". This will not have any affect on flash or other media players, and could potentially get confused if you have more than one media player actively playing at any given time.	2015-11-23 17:47:18 -08:00
redmatrix	34b804e9dc	Merge pull request #182 from anaqreon/url-selected ... Place link around selected text	2015-11-24 09:41:55 +11:00
redmatrix	a7e4553ea7	delivery report tweaks	2015-11-22 17:12:30 -08:00
Mario Vavti	d726c921eb	make calendar week start (sun or mon) configurable	2015-11-21 15:33:57 +01:00
Andrew Manning	fee8503093	Merge branch 'master' of https://github.com/redmatrix/hubzilla into url-selected	2015-11-20 21:57:10 -05:00
Andrew Manning	6083cd2559	If text is selected in profile-jot-text when the link button is pressed, the input URL is applied around the text. Otherwise, the normal link data fetch occurs.	2015-11-20 21:55:13 -05:00
Mario Vavti	7399f7a087	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2015-11-20 16:40:13 +01:00
Mario Vavti	a3e47d26f6	make calendar language aware	2015-11-20 16:39:55 +01:00
jeroenpraat	d3bef2adc3	update es+nl	2015-11-20 15:18:51 +01:00
jeroenpraat	c7652fc29c	Had to switch these 2. Sorry.	2015-11-20 00:50:54 +01:00
jeroenpraat	a890ee6864	Some bits	2015-11-20 00:39:47 +01:00
Mario Vavti	ba52af786e	move today button from aside to section title	2015-11-19 11:38:34 +01:00
Mario Vavti	929f524e77	css fixes	2015-11-19 11:17:24 +01:00
Mario Vavti	b23284cba2	move moment.min.js and remove unneeded files	2015-11-18 23:56:25 +01:00
Mario Vavti	e4145deeb7	some events refacturing	2015-11-18 23:50:42 +01:00
redmatrix	68da4d90dc	fix admin plugin hooks	2015-11-17 20:44:57 -08:00
redmatrix	a089064588	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-11-17 15:04:04 -08:00
redmatrix	a06f7fbe2e	photo album widget permissions issue	2015-11-17 15:03:27 -08:00
Mario Vavti	6fa0807550	more css fixes	2015-11-17 23:01:24 +01:00
Mario Vavti	9e3d130ad9	css fixes	2015-11-17 11:32:37 +01:00
Mario Vavti	b531486dab	show jotnets toggle button only if there are jotnets and whitespace fixes	2015-11-17 10:46:38 +01:00
redmatrix	6df98f080b	fix api/direct_messages/new at least for the json case. We seem to have a missing template for XML	2015-11-16 19:17:39 -08:00
jeroenpraat	def5edf93c	nl+es and some other bits	2015-11-14 20:43:34 +01:00
redmatrix	93e5449c08	really basic photo album widget for content regions	2015-11-12 20:22:36 -08:00
jeroenpraat	5afe8e5aa1	Small update to Bluegrid and generic-content-wrapper-styled to dreport	2015-11-12 22:10:20 +01:00
redmatrix	fba2603304	add avatars to likes/dislikes/etc.	2015-11-09 15:58:19 -08:00
redmatrix	7d5acef20a	remove list bullets from extended like list	2015-11-09 15:18:26 -08:00
jeroenpraat	b99b6b5ae9	This is better	2015-11-09 16:37:22 +01:00
jeroenpraat	cda81e35db	Using bootstrap classes, so other themes/schemas also work. Plus margin when collapsed.	2015-11-09 15:08:50 +01:00
Wave	115a53225e	Merge pull request #137 from wave72/master ... Updated Italian strings	2015-11-09 08:58:58 +01:00
Paolo Tacconi	36c196e18c	Updated Italian strings	2015-11-09 08:54:18 +01:00
redmatrix	5e1b61eb02	some more db doco	2015-11-08 20:02:35 -08:00
redmatrix	4e1c308162	make jotnets modal	2015-11-08 17:48:43 -08:00
Tobias Luther	8639eda70f	Quick fix: Moved Twitter select box to the top of ACL selector	2015-11-08 12:20:58 +01:00
jeroenpraat	2b0b03eebc	Fix ffsapi for non-English languages (or better when 's was used in the strings) - Update nl+es	2015-11-08 00:04:02 +01:00
jeroenpraat	0db5a8673d	Firefox share (that seems now the official name) button added to misc. settings.	2015-11-05 16:20:56 +01:00
jeroenpraat	1c0fe89368	Chat page improved (I think). Works now better with diff. resolutions, font sizes and languages. Fixed follow field on conn. page. Small schemas updates.	2015-11-04 22:52:40 +01:00
Wave	9398e49eb7	Merge pull request #125 from wave72/master ... Updated Italian strings	2015-11-04 15:04:20 +01:00
Paolo Tacconi	50cf095c00	Updated Italian strings	2015-11-04 14:58:52 +01:00
redmatrix	c57926d799	Merge pull request #119 from sasiflo/master ... Some small rebranding for Hubzilla transition from Red Matrix	2015-11-04 16:00:32 +11:00
redmatrix	77a03e376c	Merge https://github.com/redmatrix/redmatrix into pending_merge ... Conflicts: include/photo/photo_driver.php include/text.php mod/post.php	2015-11-03 20:46:47 -08:00
redmatrix	e09b49288f	provide admin setting to change directory server	2015-11-03 18:34:16 -08:00
redmatrix	c1cfcc78fe	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-11-03 14:59:43 -08:00
redmatrix	2c299a9f37	implement unfollow thread	2015-11-03 14:59:14 -08:00
jeroenpraat	d1aa672388	small update Ducth strings + fix dark schema	2015-11-03 21:19:23 +01:00
sasiflo	b21f6fd619	Merge branch 'rebranding'	2015-11-03 11:35:44 +01:00
sasiflo	39245238fd	Some small rebranding for Hubzilla transition from Red Matrix	2015-11-03 11:31:19 +01:00
Mario Vavti	43d8090182	timeago() works best with iso format. fix #118	2015-11-03 11:19:22 +01:00
redmatrix	d3183467e0	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-11-01 15:52:35 -08:00
redmatrix	b62614bbd4	improve /locs page with some field notes and the ability to do a forced sync	2015-11-01 15:51:45 -08:00
jeroenpraat	618155e6ab	More Bluegrid fine tuning and generic-content-wrapper-styled added to some tpl-files and 2 php files, cause they dont have a tpl file.	2015-11-01 22:59:32 +01:00
Mario Vavti	0353b0e04f	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2015-11-01 11:17:04 +01:00
jeroenpraat	3262d819de	update srings nl+es, wrapper-styled 1 tpl-file, more finetuning bluegrid schema.	2015-10-31 22:34:59 +01:00
jeroenpraat	52120b367a	Update nl+es	2015-10-31 21:07:57 +01:00
Mario Vavti	5920a96da7	make attachments appear in a dropdown in wall-item-tools-left	2015-10-31 00:38:01 +01:00
Mario Vavti	f8b767ed32	fix photo item for search_item.tpl and a minor css fix	2015-10-30 18:46:16 +01:00
redmatrix	96402a2354	This may take a few iterations to discover the best way to present the information, but we need a way for members to know what alternate locations are available for a channel during times of server issues - and as recently discovered if there aren't any hublocs at all; without digging around the database and probing channels and other messy stuff.	2015-10-29 01:23:56 -07:00
jeroenpraat	605381f83d	More fine tuning bluegrid schema. Extra generic-wrapper-styled.	2015-10-27 22:52:54 +01:00
Mario Vavti	71f70b4377	css fixes	2015-10-27 12:52:21 +01:00
jeroenpraat	02527552fd	Better -styled.	2015-10-27 01:23:30 +01:00
jeroenpraat	ac5b9f2382	Another .generic-content-wrapper	2015-10-27 01:20:48 +01:00
jeroenpraat	fc65496d1d	NEW: Redbasic schema, based on the Hubzilla project page layout.	2015-10-27 01:11:50 +01:00
jeroenpraat	35857931ef	2 more tpl files with generic-content-wrapper-styled	2015-10-26 22:47:47 +01:00
jeroenpraat	6cb7afcbc0	es+nl strings	2015-10-26 16:35:44 +01:00
jeroenpraat	32a0f5b04a	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2015-10-26 15:28:11 +01:00
jeroenpraat	3bc6190bdd	Update Dark schema	2015-10-26 15:27:47 +01:00
Mario Vavti	4fb9571136	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2015-10-26 14:20:06 +01:00
Mario Vavti	e70bb371d9	bring back item transparency	2015-10-26 14:19:46 +01:00
jeroenpraat	2099ac0615	Revert this one. This was hub specific.	2015-10-26 14:16:05 +01:00
jeroenpraat	5e28b1216e	Added a few generic-content-wrapper-styled classes and a button position fixed for lostpass. mod/search probably needs a .tpl in the future, but I don't know how to that.	2015-10-26 14:05:45 +01:00
jeroenpraat	e858ee811b	Fixed connection page. Page was overcrowded on systems with larger fonts.	2015-10-26 13:57:12 +01:00
redmatrix	a498fc8e72	looks like there may be issues with the datetime picker if the local timezone isn't the same as your settings.	2015-10-25 21:17:02 -07:00
redmatrix	917d0ced4a	new feature: delayed posting	2015-10-25 16:54:18 -07:00
Mario Vavti	fd1e163bf4	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2015-10-24 21:44:45 +02:00
Mario Vavti	ab8b4d5c36	another try to avoid dubble photo deletion. allow to set a photo caption and simple status body (if create status post is enabled) on upload	2015-10-24 21:44:25 +02:00
Wave	4a044351a9	Merge pull request #97 from wave72/master ... Italian strings updated	2015-10-24 12:15:15 +02:00
wave72	e0a2268b0e	Italian strings updated	2015-10-24 12:13:17 +02:00
Mario Vavti	9ae215291f	fix app.tpl missing </div> tag if not authenticated	2015-10-23 10:20:01 +02:00
mcnesium	379fd33484	fix placeholder font-family ... [Imgur](http://i.imgur.com/Cegabd5.png)	2015-10-22 13:44:33 +02:00
Mario Vavti	ed6629002f	photo object fixes	2015-10-22 13:01:33 +02:00
Mario Vavti	bcb4ac7aae	experiment: put the photo-item photo on top of the post	2015-10-22 12:58:11 +02:00
Mario Vavti	6f8d29ad80	move photo object stuff from itemObject to prepare_body() so we can do more stuff with it	2015-10-22 10:52:10 +02:00
Mario Vavti	232742a5e6	warn if quota exceeds 90% of storage limit	2015-10-21 12:52:03 +02:00
Mario Vavti	a33ddf373b	move file storage quota display to upload section. add a warning if remaining space is less than 100MB and fix % calculation	2015-10-21 12:40:09 +02:00
redmatrix	38816d7e41	move quota display to where it's visible on a tablet	2015-10-20 18:48:14 -07:00
Mario Vavti	13d0db5f9a	css cleanup	2015-10-20 09:47:30 +02:00
Mario Vavti	f7601756e9	create photo object if feature large photos is enabled and display those slightly different	2015-10-20 09:36:15 +02:00
redmatrix	ea37882b95	Merge https://github.com/redmatrix/redmatrix into pending_merge ... Conflicts: include/zot.php install/schema_mysql.sql install/schema_postgres.sql install/update.php mod/zfinger.php	2015-10-19 16:18:04 -07:00
Paolo Tacconi	8da8e02dc8	Replaced some old redmatrix branding	2015-10-19 10:51:33 +02:00
jeroenpraat	6eaf35a142	Update es+nl	2015-10-18 19:09:38 +02:00
jeroenpraat	52f3d6722d	Update nl+es	2015-10-18 16:45:11 +02:00
Mario Vavti	126628546b	tweak justify gallery options to not load to large previews	2015-10-18 14:21:42 +02:00
redmatrix	be701677d6	Merge https://github.com/redmatrix/redmatrix into pending_merge ... Conflicts: view/nl/messages.po view/nl/strings.php	2015-10-17 16:38:57 -07:00
redmatrix	1d2797dc1f	bring back chat expiration setting and adjust chat size for our now smaller content region	2015-10-17 14:54:27 -07:00
Mario Vavti	b7408fa39e	we now provide images for all suffixes (0-3) -> simplify photo item body creation and provide width x height for any size	2015-10-16 16:27:51 +02:00
jeroenpraat	7ca5b5c928	Update Dutch strings	2015-10-16 15:31:11 +02:00
Mario Vavti	73082a338b	(re)add default image-size 320px - it is good for gallery preview. this size has the suffix -3 now	2015-10-15 12:56:22 +02:00
Mario Vavti	1593ebec1f	update conv_list.tpl	2015-10-15 11:49:33 +02:00
Mario Vavti	2413968021	double up default photo sizes - even the mos simple camera can now do images > 1024px	2015-10-15 11:20:56 +02:00
Mario Vavti	2848f5dab4	Merge branch 'master' of https://github.com/redmatrix/hubzilla	2015-10-15 09:36:51 +02:00
redmatrix	de697a4267	issue #86 - like/dislike in photos not working	2015-10-14 14:16:16 -07:00
Mario Vavti	b4e83b6537	allow photo-items to appear full width if large photos feature is enabled. in prepare_body() split off mentions, tags, categories folders and attachments from body for easier theming. some other little fixes.	2015-10-14 22:14:19 +02:00
Wave	e3070eb170	Merge pull request #81 from tuscanhobbit/master ... Italian strings updated	2015-10-14 09:12:58 +02:00