Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| | * | Fix url in profile tabs | Fabio Comuni | 2011-10-10 | 3 | -5/+7 |
| | | | |||||
| * | | Merge pull request #26 from fabrixxm/master | fabrixxm | 2011-10-10 | 25 | -209/+167 |
| |\| | | | | | | | New common tab template. Updated css | ||||
| | * | New common tab template. Update css | Fabio Comuni | 2011-10-10 | 25 | -209/+167 |
| | | | |||||
* | | | 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 |
|/ | |||||
* | 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 | ||||
| * | Anne set testbubble banner to be fixed, I added the other notification types ↵ | Devlon Duthie | 2011-10-07 | 12 | -130/+326 |
|/ | | | | to /notifcations, added link to notifcations drop-down for all notifications and added notifications drop-down to testbubble theme | ||||
* | local_deliver testing | Friendika | 2011-10-06 | 4 | -662/+85 |
| | |||||
* | local deliver 1 | Friendika | 2011-10-06 | 1 | -0/+664 |
| | |||||
* | revup | Friendika | 2011-10-06 | 1 | -1/+1 |
| | |||||
* | check author url to see if it matches current contact before relay is accepted | Friendika | 2011-10-06 | 1 | -0/+8 |
| | |||||
* | use strpos instead of strstr, faster | Friendika | 2011-10-05 | 1 | -1/+1 |
| | |||||
* | ensure D* photos only attached once | Friendika | 2011-10-05 | 1 | -5/+7 |
| | |||||
* | bug 173 | Friendika | 2011-10-05 | 1 | -0/+42 |
| | |||||
* | provide ability to repair contact photo | Friendika | 2011-10-05 | 3 | -1/+33 |
| | |||||
* | mostly cosmetic changes to make DB tables accurately reflect the ↵ | Friendika | 2011-10-05 | 4 | -7/+11 |
| | | | | conversation members | ||||
* | Merge branch 'pull' | Friendika | 2011-10-05 | 1 | -1/+1 |
|\ | |||||
| * | Merge pull request #19 from tobiasd/master | Friendika | 2011-10-05 | 1 | -1/+1 |
| |\ | | | | | | | link Diaspora* to the foundation homepage | ||||
| | * | point Diaspora* to the foundation homepage instead of joindiaspora.com | Tobias Diekershoff | 2011-10-05 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' of git://github.com/friendika/Free-Friendika | Tobias Diekershoff | 2011-10-05 | 85 | -2961/+1745 |
| | |\ | |||||
| | * \ | Merge branch 'master' of git://github.com/friendika/Free-Friendika | Tobias Diekershoff | 2011-09-29 | 0 | -0/+0 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' of git://github.com/friendika/Free-Friendika | Tobias Diekershoff | 2011-09-29 | 26 | -462/+134 |
| | |\ \ \ | |||||
* | | | | | | clean up w3c validation and layout for priv mail and lang selector | Friendika | 2011-10-05 | 8 | -11/+17 |
|/ / / / / | |||||
* | | | | | Merge branch 'pull' | Friendika | 2011-10-05 | 2 | -33/+123 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge pull request #18 from duthied/master | duthied | 2011-10-05 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | tweak to notification drop-down line items in testbubble theme | ||||
| | * | | | | wrapped notification line item with the anchros tag instead of the inner, ↵ | Devlon Duthie | 2011-10-05 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | makes the whole line item a link (better) | ||||
| * | | | | Merge pull request #17 from duthied/master | duthied | 2011-10-05 | 2 | -33/+123 |
| |\ \ \ \ | | | | | | | | | | | | | drop-down notification menu support added to testbubble theme |