11433 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Thomas Willingham	1a4a248a26	A...typo? Relic of some kind.	2014-09-30 21:09:11 +01:00
Thomas Willingham	49b351d86a	Couple of site specific files missing from gitignore	2014-09-30 21:08:09 +01:00
friendica	cef570991a	Merge https://github.com/friendica/red into pending_merge	2014-09-29 23:37:16 -07:00
friendica	f8468b4c3a	allow custom role permissions and fix site timezone.	2014-09-29 23:36:41 -07:00
Jeroen	0283720302	no spaces in file names as requested	2014-09-30 05:48:29 +00:00
friendica	5292e3a100	implement a "powered-by" but leave it turned off until somebody with a good eye for layout can figure out where best to put it.	2014-09-29 21:58:35 -07:00
Thomas Willingham	7c3b428e67	Merge branch 'master' of https://github.com/friendica/red	2014-09-29 19:12:12 +01:00
Thomas Willingham	90378e8ef8	Silence insanely noisy log - should probably stick this in a dlogger ... if we need it - we're getting literally hundreds of thousands of these.	2014-09-29 19:06:43 +01:00
Jeroen	43d2a8ceae	ok, last commit so far on the simple schemas	2014-09-29 15:37:50 +00:00
Jeroen	6c4a54dbfd	transp back	2014-09-29 15:20:04 +00:00
Jeroen	67035a5507	minor modification simple black on white schema.	2014-09-29 15:06:47 +00:00
Jeroen	d33b9e3a91	Added 3 new schemas, all named 'simple' in 3 variants. Please enjoy.	2014-09-29 14:23:26 +00:00
RedMatrix	f7595cc11a	Merge pull request #607 from tuscanhobbit/dev ... Numbers shouldn't be strings	2014-09-29 20:43:44 +10:00
Paolo Tacconi	d09003dcff	Numbers shouldn't be strings	2014-09-29 10:05:31 +02:00
Paolo T	3e9fb3be5a	Merge pull request #606 from tuscanhobbit/dev ... Italian strings updated	2014-09-29 10:02:44 +02:00
Paolo Tacconi	a30af47ed7	Italian strings updated	2014-09-29 10:01:34 +02:00
RedMatrix	6370713cc1	Merge pull request #605 from habeascodice/master ... 2 minor bug-fixes, a line of docu, and a call_hooks() hook	2014-09-29 13:08:56 +10:00
habeascodice	c07643e407	Allows extra content to be inserted at end of profile_photo page. Needed for openclipatar addon.	2014-09-28 19:33:37 -07:00
habeascodice	5f58603158	relevant now that site statistics are all the hotness	2014-09-28 19:32:13 -07:00
habeascodice	73ebdff083	Merge remote branch 'upstream/master'	2014-09-28 19:31:19 -07:00
habeascodice	c0b59ae36a	Typo in regex causes runtime error	2014-09-28 19:30:47 -07:00
marijus	e18dfbe3ce	Merge branch 'master' of https://github.com/friendica/red	2014-09-28 23:15:24 +02:00
marijus	97c6ba77c7	some more work on photos	2014-09-28 23:14:49 +02:00
RedMatrix	114394c6ca	Merge pull request #604 from tuscanhobbit/dev ... Statistics copied into siteinfo/json	2014-09-29 06:25:08 +10:00
tuscanhobbit	9dee1779cf	added statistics to siteinfo json	2014-09-28 19:31:04 +02:00
Thomas Willingham	ffe6d20dc0	BBCode - $1 wrote doesn't make sense as a spoiler. $1 spoiler does.	2014-09-28 03:20:49 +01:00
marijus	c20c9e99b6	Merge branch 'master' of https://github.com/friendica/red	2014-09-27 15:42:28 +02:00
marijus	38605eefdd	more css shifting	2014-09-27 15:41:49 +02:00
friendica	2b02f611ad	Merge https://github.com/friendica/red into pending_merge	2014-09-27 05:11:32 -07:00
friendica	913109796e	provide backup copy of post for diaspora reshare and re-fetch	2014-09-27 05:10:09 -07:00
RedMatrix	e1ae60246a	Merge pull request #603 from dawnbreak/docu ... Some documentation for include/config.php.	2014-09-27 17:19:41 +10:00
friendica	51c0904a8a	Merge https://github.com/friendica/red into pending_merge	2014-09-27 00:15:43 -07:00
friendica	fa019791fa	some background work for import/export of things and liked things/profiles	2014-09-27 00:14:35 -07:00
Klaus Weidenbach	2681071970	Some documentation of include/config.php. ... I hope my guesses are not completely wrong, anyway please take look not that I tell complete bullshit.	2014-09-26 22:28:35 +02:00
marijus	04e460c8f8	upload first but not inside another {{if}}	2014-09-26 19:34:39 +02:00
marijus	a7269e9d6e	upload should be first	2014-09-26 19:28:28 +02:00
marijus	f652fbdf74	fix blockquote	2014-09-26 19:17:02 +02:00
Thomas Willingham	94fcf5885e	So much so, in fact, that I didn't even notice the typo.	2014-09-26 17:16:55 +01:00
Thomas Willingham	c9e8a3e8fe	Minor doco. Add some clarity - that had me scratching my head.	2014-09-26 17:05:22 +01:00
Paolo Tacconi	eaf96f987a	Rebase from upstream	2014-09-26 14:40:22 +02:00
marijus	574c4845b7	move some css to the right place	2014-09-26 12:34:22 +02:00
marijus	b948ab5955	some more work on photos - work in progress	2014-09-26 12:29:07 +02:00
friendica	1e7fbac6c1	doc updates, clean up buttons on PM edit template to match other edit buttons	2014-09-26 01:52:30 -07:00
friendica	d8c03526ed	optionally include wall items (posts) in import/export	2014-09-25 20:21:23 -07:00
Thomas Willingham	e75f1ccb2e	Typo	2014-09-25 19:47:06 +01:00
Paolo Tacconi	6324a07dd8	Rebase from upstream	2014-09-25 08:44:07 +02:00
friendica	92c723d37c	constrain viewsrc colorbox to 80% of the current page size. It gets messy scrolling to the right for days to find the close button.	2014-09-24 17:32:38 -07:00
friendica	24d402941f	if no rss/atom element author, use feed level contact	2014-09-24 14:27:18 -07:00
friendica	c76b8febaa	make it the default	2014-09-24 02:18:13 -07:00
friendica	95470a9f9b	one step closer	2014-09-24 02:08:35 -07:00