3421 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
friendica	341fcce75e	preg_quote search strings	2011-12-06 19:51:19 -08:00
friendica	7eba8adbf7	pm replies	2011-12-06 19:15:42 -08:00
friendica	0c24784f5e	include diaspora mentions in personal (requires adding a Diaspora profile url because they don't use ours)	2011-12-06 15:24:01 -08:00
friendica	f6f151433c	Merge pull request #16 from zzottel/master ... Unpause the stream when posting a comment or liking/disliking	2011-12-06 12:23:43 -08:00
Tobias Diekershoff	06b904ffcb	copied code styling from duepuntozero to quattro theme	2011-12-06 17:10:27 +01:00
zottel	237b4c74c2	unpause the stream when posting a comment or liking/disliking	2011-12-06 01:22:59 -08:00
friendica	f3c91edd95	Merge pull request #15 from zzottel/master ... Added pausing of automatic stream reloads using Ctrl-Space	2011-12-06 00:35:25 -08:00
friendica	be8e9d3616	d* pm	2011-12-06 00:16:13 -08:00
zottel	cd3a02ab8e	Merge remote branch 'upstream/master'	2011-12-06 00:02:29 -08:00
zottel	c5c99089ff	Added stopping automatic reloads with Ctrl-Space. Will stay stopped till next Ctrl-Space.	2011-12-06 00:00:27 -08:00
friendica	47f369e052	hide some contacts from others	2011-12-05 18:36:26 -08:00
friendica	d2e110abf5	Merge branch 'pull'	2011-12-05 14:07:59 -08:00
friendica	adbc84c48e	maintain backward compatibility with old PMs	2011-12-05 14:06:41 -08:00
fabrixxm	328e3eabaf	Merge pull request #14 from zzottel/master ... Added #pause to testbubble/style.css	2011-12-05 05:23:13 -08:00
zottel	ced28a8827	added #pause	2011-12-05 05:17:37 -08:00
friendica	c8d5274cee	data structures to support hidden friends	2011-12-05 02:16:59 -08:00
friendica	116e20c89d	add conv structure	2011-12-05 00:35:44 -08:00
fabrixxm	7d721892c3	Merge pull request #13 from zzottel/master ... added img properties to testbubble/style.css to get good results on all screen sizes	2011-12-05 00:34:14 -08:00
zottel	3d0f17570f	added img properties to get good results on all screen sizes	2011-12-05 00:29:29 -08:00
friendica	6fc9eae9de	more d* PM stuff	2011-12-04 17:26:55 -08:00
friendica	fb01d8bec5	fix incorrect default author	2011-12-04 03:54:40 -08:00
friendica	fb437a874e	typo	2011-12-04 03:50:26 -08:00
friendica	f6dd834284	fix author-name when missing on comments	2011-12-04 03:45:09 -08:00
friendica	8a489b4762	unix style homedir	2011-12-04 03:01:04 -08:00
friendica	acd28bb1ef	add a bookmark index, needed by network queries	2011-12-03 13:53:49 -08:00
friendica	172fdbcdcf	bug #232	2011-12-03 00:08:04 -08:00
fabrixxm	09d8a3b69f	Merge pull request #12 from zzottel/master ... Fix testbubble photo-menu	2011-12-02 08:27:42 -08:00
zottel	5dcce83927	Take out overflow: hidden; from .wall-item-outside-wrapper to fix ... problem with photo-menu being cut off.	2011-12-02 08:02:10 -08:00
fabrixxm	e36bdd5c89	Merge pull request #11 from fabrixxm/master ... mention notification in ping	2011-12-02 07:35:08 -08:00
Fabio Comuni	ccc8486544	ping: mention rewording	2011-12-02 08:34:03 +01:00
friendica	7faa6c3e93	more theme works	2011-12-01 22:44:27 -08:00
friendica	d703f4bc52	theme works d'zero	2011-12-01 20:57:09 -08:00
friendica	513c1c0d68	dynamic delete icons for saved-search on network page	2011-12-01 18:27:45 -08:00
friendica	ac3df5fece	dynamic group edit buttons	2011-12-01 16:33:53 -08:00
Fabio Comuni	6705549d66	ping: add @-tag notifs, fix intros url	2011-12-01 16:36:02 +01:00
friendica	29b5d398fd	everybody group gets id 0	2011-11-30 23:01:42 -08:00
friendica	f1af2c224f	personal notifications	2011-11-30 22:26:02 -08:00
friendica	37730ecc2a	typo	2011-11-30 17:08:16 -08:00
friendica	8f381e01ae	html_entity_decode D* incoming text	2011-11-30 03:22:01 -08:00
friendica	73564df4d8	fine tune personal regex's	2011-11-29 22:49:05 -08:00
friendica	84e197cde9	missing paren	2011-11-29 19:53:18 -08:00
friendica	7474c48022	add tag to personal	2011-11-29 19:52:14 -08:00
friendica	7b9ba3bb03	personal tab on network page	2011-11-29 14:35:20 -08:00
friendica	3bf192ba08	Merge branch 'pull'	2011-11-29 01:19:43 -08:00
friendica	aa73d38845	begininning d* conversation mode	2011-11-29 01:19:09 -08:00
friendica	669f40c342	private notes in testbubble	2011-11-29 01:18:18 -08:00
fabrixxm	f6ff4e582f	Merge pull request #10 from fabrixxm/master ... small quattro things	2011-11-29 00:32:12 -08:00
Fabio Comuni	68dee0fa71	quattro: "manage" menu item in site menu	2011-11-29 09:30:21 +01:00
Fabio Comuni	938b2bf438	quattro: default user image in item	2011-11-29 09:29:56 +01:00
friendica	3afa248238	use default post permissions when coming from api - unless permissions are explicitly set.	2011-11-28 20:09:10 -08:00