Commit Graph

3127 Commits

Author SHA1 Message Date
Friendika 85c644a828 Merge branch 'pull' 2011-10-18 00:28:53 -07:00
Friendika 06096486d4 hopefully solve db update issues bug #182 2011-10-18 00:18:21 -07:00
fabrixxm a19b33651e Merge pull request #33 from fabrixxm/master
missing template field_openid
2011-10-17 23:56:02 -07:00
Fabio Comuni 3e5a2cb07b template field_openid 2011-10-18 08:53:01 +02:00
Tobias Diekershoff cc5974e6c2 Merge pull request #32 from tobiasd/master
quattro buttons
2011-10-17 23:21:00 -07:00
Tobias Diekershoff 307b707983 fix for the button height 2011-10-18 08:17:52 +02:00
Friendika 0f24f3b505 post/comment order options 2011-10-17 18:24:23 -07:00
Friendika 42a9817350 "cubbi.es" 2011-10-17 17:39:25 -07:00
Friendika f0dc77ab6c Merge branch 'pull' 2011-10-17 14:55:46 -07:00
Friendika 278433eac7 origin flag handling, and bug #137 - provide timezone conversion for events posted across to Diaspora 2011-10-17 14:52:03 -07:00
Tobias Diekershoff e15aab9b75 Merge pull request #31 from tobiasd/master
small thing
2011-10-17 08:41:27 -07:00
Tobias Diekershoff 9254c13f62 reverted rewrite base 2011-10-17 17:40:00 +02:00
fabrixxm 399f630b10 Merge pull request #30 from fabrixxm/master
some fix and and some other works
2011-10-17 08:20:26 -07:00
Fabio Comuni 5830682e0c another fix to tabs in notifications 2011-10-17 17:14:10 +02:00
Fabio Comuni b22ab4e308 fix buttons in quattro 2011-10-17 17:11:49 +02:00
Fabio Comuni a2dc8bad2e fix tabs in notifications 2011-10-17 16:54:21 +02:00
Fabio Comuni de44072172 works on login form 2011-10-17 16:53:59 +02:00
Fabio Comuni 2116943964 Merge remote-tracking branch 'friendika/master' 2011-10-17 16:37:37 +02:00
Tobias Diekershoff 1df892ebbc Merge pull request #29 from tobiasd/master
separate youtube button removed from dispy and quattro
2011-10-16 23:08:45 -07:00
Tobias Diekershoff 2650ba49c1 video button only for dispy and quattro 2011-10-17 07:48:33 +02:00
Friendika b820dfa31f revup 2011-10-16 01:46:00 -07:00
Friendika 5dcc10a5d9 working on long-term solution to relay issue 2011-10-15 03:26:37 -07:00
Friendika af6ab38100 diaspora birthday notifications 2011-10-14 00:20:37 -07:00
Friendika 05e26e4895 handle diaspora profile update message 2011-10-13 18:32:02 -07:00
Friendika 89c771a26e remove queued items for contact when removing contact 2011-10-13 15:39:05 -07:00
Friendika 4eae1e5d8a don't propagate deletions for other people's stuff 2011-10-13 15:32:43 -07:00
Friendika d60505ffb0 missing arg xmlize x is friends with y 2011-10-13 01:12:03 -07:00
Friendika 2911bf9434 sql issue item_store 2011-10-13 01:00:06 -07:00
Friendika ac3a6d1d1e Merge branch 'pull' 2011-10-12 02:28:31 -07:00
Friendika 3db43d5a39 storage race condition 2011-10-12 02:21:18 -07:00
Tobias Diekershoff f19764c93a Merge pull request #28 from tobiasd/master
some minor stuff for the quattro theme
2011-10-12 00:34:36 -07:00
Tobias Diekershoff 98e50a0559 better do all the buttons (quattro) 2011-10-12 09:28:19 +02:00
Tobias Diekershoff 714319457c little bit more for quattro 2011-10-12 08:06:41 +02:00
Tobias Diekershoff 0fb119496e some work on quattro theme 2011-10-12 07:47:41 +02:00
Friendika df7702709b common tabs to notifications and mail 2011-10-11 21:30:23 -07:00
Friendika 3ef7dcac4b solve intro/notify naming issue by providing both or either, theme decides what to do 2011-10-11 20:38:09 -07:00
Friendika 2206d894b3 add contact_widgets and provide widgets on appropriate pages, fix the saved search widget
fix directory page on testbubble, don't use system theme for community, directory, and search if the viewer is logged in.
2011-10-11 19:27:58 -07:00
Friendika 557a7d0cec stuff
- background the external network notifications (Facebook, Twitter, Statusnet)
 - add vimeo support
 - consolidate editor video options (insert video, regardless of source)
 - add "Connector Settings" page purely for configuring connectors
 - moved mailbox settings to Connectors
 - Move the "Connect/Follow" dialogue out of "find people" and move to top.
 - Add "Find People" dialogue
 - minor theme edits on duepuntozero and testbubble to make all this stuff work
 - A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos.
2011-10-11 18:24:37 -07:00
Friendika caf18164f0 Merge branch 'pull' 2011-10-10 12:56:51 -07:00
Friendika 06c268b3db revup 2011-10-10 12:56:15 -07:00
Fabio Comuni 906addf865 common_tabs in notifications.php 2011-10-10 17:01:14 +02:00
Fabio Comuni e9eb15373f Remove full profile html from php and add new template 'profile_advanced.tpl' 2011-10-10 16:48:38 +02:00
fabrixxm 2ea2e7f4b4 Merge pull request #27 from fabrixxm/master
Fix url in profile tabs
2011-10-10 07:41:23 -07:00
Fabio Comuni 070e081ae9 Fix url in profile tabs 2011-10-10 16:40:12 +02:00
fabrixxm ed07a4def3 Merge pull request #26 from fabrixxm/master
New common tab template. Updated css
2011-10-10 07:33:41 -07:00
Fabio Comuni f64e2d63b9 New common tab template. Update css 2011-10-10 15:28:34 +02:00
Friendika 3174847de8 bug #177 - birthday month on profile incorrect if October or later and no year 2011-10-10 01:03:34 -07:00
Friendika 077726a193 redo 2011-10-10 00:26:52 -07:00
Friendika 1cfeb61ddc more notification cleanup duepuntozero 2011-10-09 21:34:07 -07:00
Friendika 26f2c868da some notification text cleanup and notification page layout fixes for duepuntozero 2011-10-09 20:26:17 -07:00