Commit Graph

4199 Commits

Author SHA1 Message Date
friendica ed725df5f1 Merge branch 'master' into notify 2011-12-12 20:13:12 -08:00
friendica ee4975f1cd unnecessary slash in profile update path 2011-12-12 19:08:13 -08:00
friendica bda7ca2f36 clearup update backlog after commenting 2011-12-12 18:08:09 -08:00
friendica e67f69df81 default ajax settings after conversion 2011-12-12 17:30:29 -08:00
friendica e74a960327 change default ajax interval to 40 seconds 2011-12-12 17:10:19 -08:00
friendica 01cae9a50a remove all plugins from default config 2011-12-12 16:28:33 -08:00
friendica c45b903178 live update improvements 2011-12-12 16:11:03 -08:00
friendica 80428a33d5 refactor updates 2011-12-12 14:39:25 -08:00
friendica 9a32265fc7 Merge branch 'pull' 2011-12-12 13:43:08 -08:00
friendica b10e20c599 revup 2011-12-12 13:41:51 -08:00
zzottel ea638e97ad Merge pull request #18 from zzottel/master
Switch to jquery 1.7.1
2011-12-12 08:13:51 -08:00
zottel 720787b772 Switch to jquery 1.7.1 2011-12-12 08:11:35 -08:00
friendica cbdc667ba2 separate dfrn introductions from email when it comes to expiration of blocked requests 2011-12-11 23:33:56 -08:00
friendica a38d3b82b9 browser_update settings 2011-12-11 21:03:33 -08:00
friendica 4f254ffb5b system support for personal configurable ajax update interval 2011-12-11 20:32:43 -08:00
friendica 50c4b9a780 Merge branch 'master' into notify 2011-12-11 20:03:46 -08:00
friendica 834639ebab \o/ smiley 2011-12-11 16:58:36 -08:00
friendica acdc7ca05a typo in db sql 2011-12-10 01:50:37 -08:00
friendica ac9f21806e Merge branch 'pull' 2011-12-09 16:51:15 -08:00
friendica 102ea901c3 cannot register at all when multiple_pages is not allowed 2011-12-09 16:50:13 -08:00
friendica 727661d454 revup 2011-12-09 16:48:15 -08:00
friendica 5b3155579a fix diaspora's illegal webfinger xml before sending to parser 2011-12-09 16:46:18 -08:00
friendica 3da3cd686c notifications refactor 2011-12-08 01:28:27 -08:00
friendica 9849a54cde Merge pull request #17 from zzottel/master
Fixed some gltiches in testbubble theme
2011-12-08 00:32:22 -08:00
zottel f661bb4250 fixed some glitches in testbubble theme 2011-12-08 00:12:51 -08:00
friendica 961e34f67f missing template 2011-12-07 15:26:17 -08:00
friendica d100944fe6 api post default to default post permissions was broken 2011-12-07 14:04:34 -08:00
friendica efeb377a12 w3c valid cleanup 2011-12-06 20:56:51 -08:00
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