aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* stuffFriendika2011-10-1125-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'Friendika2011-10-1025-209/+169
|\
| * Merge pull request #27 from fabrixxm/masterfabrixxm2011-10-103-5/+7
| |\ | | | | | | Fix url in profile tabs
| | * Fix url in profile tabsFabio Comuni2011-10-103-5/+7
| | |
| * | Merge pull request #26 from fabrixxm/masterfabrixxm2011-10-1025-209/+167
| |\| | | | | | | New common tab template. Updated css
| | * New common tab template. Update cssFabio Comuni2011-10-1025-209/+167
| | |
* | | revupFriendika2011-10-101-1/+1
|/ /
* / bug #177 - birthday month on profile incorrect if October or later and no yearFriendika2011-10-101-1/+1
|/
* redoFriendika2011-10-101-0/+10
|
* more notification cleanup duepuntozeroFriendika2011-10-092-2/+5
|
* some notification text cleanup and notification page layout fixes for ↵Friendika2011-10-093-15/+22
| | | | duepuntozero
* Merge branch 'pull'Friendika2011-10-091-1/+1
|\
| * Merge pull request #25 from duthied/masterduthied2011-10-081-1/+1
| |\ | | | | | | fix for line 117 comment
| | * fix for comment on line 117 from githubDevlon Duthie2011-10-091-1/+1
| |/
* / add first,last to D* vcardFriendika2011-10-092-1/+20
|/
* Merge pull request #24 from duthied/masterduthied2011-10-081-6/+14
|\ | | | | fixes to the notifications drop-down
| * added sorting to drop-down notifications list, added posts to this list as ↵Devlon Duthie2011-10-081-6/+14
|/ | | | well (now the counts match the items) fixed up a couple of typos
* Merge pull request #23 from duthied/masterduthied2011-10-082-3/+15
|\ | | | | +posts to the notifications page
| * added posts to network section of the notifications pageDevlon Duthie2011-10-082-3/+15
| |
* | Merge branch 'pull'Friendika2011-10-081-2/+2
|\ \
| * | Merge pull request #22 from duthied/masterduthied2011-10-081-2/+2
| |\| | | | | | | testbubble theme tweak
| | * fix for z-index on wall-to-wall avatars in testbubble themeDevlon Duthie2011-10-081-2/+2
| | |
* | | Merge branch 'pull'Friendika2011-10-082-4/+13
|\| |
| * | Merge pull request #21 from duthied/masterduthied2011-10-082-4/+13
| |\| | | | | | | notification page and drop-down fixes
| | * fix for 'show all notifications' on notifications drop-down to handle ↵Devlon Duthie2011-10-082-4/+13
| |/ | | | | | | installations in sub-directories + fix for friend notifications (eg: joe became friends with sam)
* / revupFriendika2011-10-081-1/+1
|/
* bug #175 - hide_help config option not workingFriendika2011-10-085-5/+6
|
* missing arg to diaspora_transmit from share/unshareFriendika2011-10-072-3/+3
|
* Merge pull request #20 from duthied/masterduthied2011-10-0612-130/+326
|\ | | | | Notifications page improvements + testbubble theme tweaks
| * Anne set testbubble banner to be fixed, I added the other notification types ↵Devlon Duthie2011-10-0712-130/+326
|/ | | | to /notifcations, added link to notifcations drop-down for all notifications and added notifications drop-down to testbubble theme
* local_deliver testingFriendika2011-10-064-662/+85
|
* local deliver 1Friendika2011-10-061-0/+664
|
* revupFriendika2011-10-061-1/+1
|
* check author url to see if it matches current contact before relay is acceptedFriendika2011-10-061-0/+8
|
* use strpos instead of strstr, fasterFriendika2011-10-051-1/+1
|
* ensure D* photos only attached onceFriendika2011-10-051-5/+7
|
* bug 173Friendika2011-10-051-0/+42
|
* provide ability to repair contact photoFriendika2011-10-053-1/+33
|
* mostly cosmetic changes to make DB tables accurately reflect the ↵Friendika2011-10-054-7/+11
| | | | conversation members
* Merge branch 'pull'Friendika2011-10-051-1/+1
|\
| * Merge pull request #19 from tobiasd/masterFriendika2011-10-051-1/+1
| |\ | | | | | | link Diaspora* to the foundation homepage
| | * point Diaspora* to the foundation homepage instead of joindiaspora.comTobias Diekershoff2011-10-051-1/+1
| | |
| | * Merge branch 'master' of git://github.com/friendika/Free-FriendikaTobias Diekershoff2011-10-0585-2961/+1745
| | |\
| | * \ Merge branch 'master' of git://github.com/friendika/Free-FriendikaTobias Diekershoff2011-09-290-0/+0
| | |\ \
| | * \ \ Merge branch 'master' of git://github.com/friendika/Free-FriendikaTobias Diekershoff2011-09-2926-462/+134
| | |\ \ \
* | | | | | clean up w3c validation and layout for priv mail and lang selectorFriendika2011-10-058-11/+17
|/ / / / /
* | | | | Merge branch 'pull'Friendika2011-10-052-33/+123
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #18 from duthied/masterduthied2011-10-051-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 Duthie2011-10-051-1/+1
| |/ / / / | | | | | | | | | | | | | | | makes the whole line item a link (better)
| * | | | Merge pull request #17 from duthied/masterduthied2011-10-052-33/+123
| |\ \ \ \ | | | | | | | | | | | | drop-down notification menu support added to testbubble theme
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 18:10:56 +0000