Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'friendika/master' | Fabio Comuni | 2011-10-17 | 44 | -293/+1121 |
|\ | |||||
| * | Merge pull request #29 from tobiasd/master | tobiasd | 2011-10-16 | 2 | -6/+0 |
| |\ | | | | | | | separate youtube button removed from dispy and quattro | ||||
| | * | video button only for dispy and quattro | Tobias Diekershoff | 2011-10-17 | 2 | -6/+0 |
| |/ | |||||
| * | working on long-term solution to relay issue | Friendika | 2011-10-15 | 5 | -16/+27 |
| | | |||||
| * | diaspora birthday notifications | Friendika | 2011-10-14 | 7 | -11/+90 |
| | | |||||
| * | handle diaspora profile update message | Friendika | 2011-10-13 | 1 | -0/+78 |
| | | |||||
| * | remove queued items for contact when removing contact | Friendika | 2011-10-13 | 1 | -0/+4 |
| | | |||||
| * | don't propagate deletions for other people's stuff | Friendika | 2011-10-13 | 2 | -1/+12 |
| | | |||||
| * | missing arg xmlize x is friends with y | Friendika | 2011-10-13 | 1 | -1/+1 |
| | | |||||
| * | sql issue item_store | Friendika | 2011-10-13 | 3 | -4/+4 |
| | | |||||
| * | Merge branch 'pull' | Friendika | 2011-10-12 | 3 | -0/+437 |
| |\ | |||||
| | * | Merge pull request #28 from tobiasd/master | tobiasd | 2011-10-12 | 3 | -0/+437 |
| | |\ | | | | | | | | | some minor stuff for the quattro theme | ||||
| | | * | better do all the buttons (quattro) | Tobias Diekershoff | 2011-10-12 | 2 | -8/+2 |
| | | | | |||||
| | | * | little bit more for quattro | Tobias Diekershoff | 2011-10-12 | 2 | -2/+2 |
| | | | | |||||
| | | * | some work on quattro theme | Tobias Diekershoff | 2011-10-12 | 3 | -0/+443 |
| | |/ | |||||
| * / | storage race condition | Friendika | 2011-10-12 | 1 | -8/+17 |
| |/ | |||||
| * | common tabs to notifications and mail | Friendika | 2011-10-11 | 4 | -34/+63 |
| | | |||||
| * | solve intro/notify naming issue by providing both or either, theme decides ↵ | Friendika | 2011-10-11 | 2 | -3/+6 |
| | | | | | | | | what to do | ||||
| * | add contact_widgets and provide widgets on appropriate pages, fix the saved ↵ | Friendika | 2011-10-11 | 9 | -44/+90 |
| | | | | | | | | | | | | search widget fix directory page on testbubble, don't use system theme for community, directory, and search if the viewer is logged in. | ||||
| * | stuff | Friendika | 2011-10-11 | 25 | -195/+324 |
| | | | | | | | | | | | | | | | | | | | | | | | | - 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. | ||||
| * | Merge branch 'pull' | Friendika | 2011-10-10 | 25 | -209/+169 |
| |\ | |||||
| | * | Merge pull request #27 from fabrixxm/master | fabrixxm | 2011-10-10 | 3 | -5/+7 |
| | |\ | | | | | | | | | Fix url in profile tabs | ||||
| | * \ | Merge pull request #26 from fabrixxm/master | fabrixxm | 2011-10-10 | 25 | -209/+167 |
| | |\ \ | | | | | | | | | | | New common tab template. Updated css | ||||
| * | | | | revup | Friendika | 2011-10-10 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | bug #177 - birthday month on profile incorrect if October or later and no year | Friendika | 2011-10-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | common_tabs in notifications.php | Fabio Comuni | 2011-10-10 | 2 | -16/+22 |
| | | | | |||||
* | | | | Remove full profile html from php and add new template 'profile_advanced.tpl' | Fabio Comuni | 2011-10-10 | 2 | -227/+191 |
| |_|/ |/| | | |||||
* | | | Fix url in profile tabs | Fabio Comuni | 2011-10-10 | 3 | -5/+7 |
| |/ |/| | |||||
* | | New common tab template. Update css | Fabio Comuni | 2011-10-10 | 25 | -209/+167 |
|/ | |||||
* | redo | Friendika | 2011-10-10 | 1 | -0/+10 |
| | |||||
* | more notification cleanup duepuntozero | Friendika | 2011-10-09 | 2 | -2/+5 |
| | |||||
* | some notification text cleanup and notification page layout fixes for ↵ | Friendika | 2011-10-09 | 3 | -15/+22 |
| | | | | duepuntozero | ||||
* | Merge branch 'pull' | Friendika | 2011-10-09 | 1 | -1/+1 |
|\ | |||||
| * | Merge pull request #25 from duthied/master | duthied | 2011-10-08 | 1 | -1/+1 |
| |\ | | | | | | | fix for line 117 comment | ||||
| | * | fix for comment on line 117 from github | Devlon Duthie | 2011-10-09 | 1 | -1/+1 |
| |/ | |||||
* / | add first,last to D* vcard | Friendika | 2011-10-09 | 2 | -1/+20 |
|/ | |||||
* | Merge pull request #24 from duthied/master | duthied | 2011-10-08 | 1 | -6/+14 |
|\ | | | | | fixes to the notifications drop-down | ||||
| * | added sorting to drop-down notifications list, added posts to this list as ↵ | Devlon Duthie | 2011-10-08 | 1 | -6/+14 |
|/ | | | | well (now the counts match the items) fixed up a couple of typos | ||||
* | Merge pull request #23 from duthied/master | duthied | 2011-10-08 | 2 | -3/+15 |
|\ | | | | | +posts to the notifications page | ||||
| * | added posts to network section of the notifications page | Devlon Duthie | 2011-10-08 | 2 | -3/+15 |
| | | |||||
* | | Merge branch 'pull' | Friendika | 2011-10-08 | 1 | -2/+2 |
|\ \ | |||||
| * | | Merge pull request #22 from duthied/master | duthied | 2011-10-08 | 1 | -2/+2 |
| |\| | | | | | | | testbubble theme tweak | ||||
| | * | fix for z-index on wall-to-wall avatars in testbubble theme | Devlon Duthie | 2011-10-08 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'pull' | Friendika | 2011-10-08 | 2 | -4/+13 |
|\| | | |||||
| * | | Merge pull request #21 from duthied/master | duthied | 2011-10-08 | 2 | -4/+13 |
| |\| | | | | | | | notification page and drop-down fixes | ||||
| | * | fix for 'show all notifications' on notifications drop-down to handle ↵ | Devlon Duthie | 2011-10-08 | 2 | -4/+13 |
| |/ | | | | | | | installations in sub-directories + fix for friend notifications (eg: joe became friends with sam) | ||||
* / | revup | Friendika | 2011-10-08 | 1 | -1/+1 |
|/ | |||||
* | bug #175 - hide_help config option not working | Friendika | 2011-10-08 | 5 | -5/+6 |
| | |||||
* | missing arg to diaspora_transmit from share/unshare | Friendika | 2011-10-07 | 2 | -3/+3 |
| | |||||
* | Merge pull request #20 from duthied/master | duthied | 2011-10-06 | 12 | -130/+326 |
|\ | | | | | Notifications page improvements + testbubble theme tweaks |