6468 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
friendica	8a86f73982	zfinger	2012-08-21 21:18:01 -07:00
friendica	30e86284af	upstream	2012-08-21 20:03:25 -07:00
friendica	9b9f35f8e5	NaCl passwords - (db update)	2012-08-21 17:48:09 -07:00
friendica	2f81fb4385	upstream fixes	2012-08-20 06:34:54 -07:00
friendica	34e42c4cb3	don't count ignored events in notifications	2012-08-16 23:11:24 -07:00
friendica	a7c1c22a2a	new contact edit mockup - verdict: too complicated, must simplify	2012-08-16 21:41:07 -07:00
friendica	57cf80754d	invitation cleanup	2012-08-16 05:29:16 -07:00
friendica	d78d6a2e66	reversed error logic	2012-08-16 05:13:51 -07:00
friendica	5c8d854d7d	zregister, cont.	2012-08-16 03:37:07 -07:00
friendica	434bcfef8b	add invitiation logic to registrations - this is starting to look good	2012-08-16 03:16:55 -07:00
friendica	adba0bd98a	That's better	2012-08-16 01:03:53 -07:00
friendica	eb911443aa	more zregister cleanup and theme separation	2012-08-16 00:51:03 -07:00
friendica	5b547ae991	registration dangling code fragment that should've been removed	2012-08-15 23:15:29 -07:00
friendica	f7c6a6ff90	item table rename parent-uri, target-type, object-type (more to come later)	2012-08-15 22:33:37 -07:00
friendica	77b334efbc	cleanup of mod_zregister, basic functionality working - new accounts getting stored.	2012-08-15 21:56:04 -07:00
friendica	2358a220ba	merge from upstream	2012-08-15 20:01:55 -07:00
friendica	2a49460c77	improvements in js localisation/translation	2012-08-13 22:12:16 -07:00
friendica	6fcb3b4415	add jquery.i18n for client side translations	2012-08-13 04:28:12 -07:00
friendica	184cf51d2f	reduce duplication - only provide one system language setting	2012-08-12 20:56:23 -07:00
friendica	9899cfb5c7	fix events ping notification backend	2012-08-11 19:40:21 -07:00
friendica	f261871346	cleanup all the theme include stuff - this could make Friendica themes work out of the box, maybe.	2012-08-11 19:28:58 -07:00
friendica	e80d69d25b	merge upstream	2012-08-11 18:54:23 -07:00
friendica	cac2d40832	Dr. Theme-instein - It Lives!	2012-08-09 22:48:13 -07:00
friendica	c8fe8f4376	where did that !@#$ "lang" come from? Get rid of it (again).	2012-08-09 20:55:34 -07:00
friendica	8c0ac63d8a	hubloc schema changes	2012-08-09 20:34:10 -07:00
friendica	26e29d7f88	zot basic comm structure (real basic)	2012-08-09 20:31:06 -07:00
friendica	f2a7fcf822	more theme modularisation and css/js management	2012-08-09 19:09:55 -07:00
friendica	0292d46e5d	merge comment threading, provide plugin/theme functions to handle css/js includes	2012-08-09 16:26:44 -07:00
friendica	432595314a	Merge https://github.com/friendica/red into zpull	2012-08-08 18:50:33 -07:00
friendica	9a39d4ade2	moving forward again	2012-08-08 18:50:04 -07:00
friendica	5c4246e603	Merge pull request #2 from beardy-unixer/master ... More theme refactoring	2012-08-08 18:13:44 -07:00
Thomas Willingham	29b8b8f82b	Merge remote-tracking branch 'upstream/master'	2012-08-09 01:35:46 +01:00
friendica	c28da56737	rev update	2012-08-08 17:09:12 -07:00
Thomas Willingham	5b1a4100e0	More wrong links	2012-08-07 21:32:19 +01:00
friendica	5f619d3254	the dynamic "show more" sort of works - but with a nagging delay. But I need to move on to bigger things. We'll leave it for now.	2012-08-06 23:10:37 -07:00
Thomas Willingham	49feb09c98	Port Comix-plain - also needs some CSS-fu, but works.	2012-08-06 21:25:29 +01:00
Thomas Willingham	62795bb544	Port Comix - needs some CSS-fu, but works.	2012-08-06 21:23:47 +01:00
Thomas Willingham	10cb60195f	Bloody hell, this touches a lot of code.	2012-08-06 19:41:27 +01:00
Thomas Willingham	fca25c1909	Theme admin menu.	2012-08-06 19:36:41 +01:00
Thomas Willingham	6fa7fa5ae8	get_theme_config_file	2012-08-06 19:31:37 +01:00
Thomas Willingham	e6763be5f3	Bring get_theme_screenshot and get_theme_info up to date.	2012-08-06 19:25:09 +01:00
friendica	c673c70c25	updates	2012-08-05 21:41:58 -07:00
friendica	4f64599210	Merge pull request #1 from beardy-unixer/master ... Port the easily portable themes.	2012-08-05 21:38:08 -07:00
Thomas Willingham	0c06cc6188	That's the zeros done. The others need more fiddling with.	2012-08-06 04:41:01 +01:00
Thomas Willingham	4adef099bd	Port Greenzero	2012-08-06 04:33:06 +01:00
Thomas Willingham	d907544d20	Port Easterbunny	2012-08-06 04:21:41 +01:00
Thomas Willingham	456ca1f3e1	Kill NS themes	2012-08-06 03:43:40 +01:00
Thomas Willingham	58ef27635a	Port darkzero	2012-08-06 03:41:30 +01:00
friendica	dcbc0c0c95	major theme re-org, only duepuntozero and slackr working atm	2012-08-01 05:02:43 -07:00
friendica	7a08942872	remember that the main thing is to keep the main thing the main thing...	2012-07-31 17:55:27 -07:00