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 |
|
Friendika
|
0657baa0b2
|
Merge branch 'pull'
|
2011-10-09 15:50:49 -07:00 |
|
Friendika
|
9f4d3bf567
|
add first,last to D* vcard
|
2011-10-09 15:49:51 -07:00 |
|
duthied
|
2f98de1e74
|
Merge pull request #25 from duthied/master
fix for line 117 comment
|
2011-10-08 22:05:47 -07:00 |
|
Devlon Duthie
|
c49ab66be8
|
fix for comment on line 117 from github
|
2011-10-09 00:02:24 -05:00 |
|
duthied
|
0e401b5ad8
|
Merge pull request #24 from duthied/master
fixes to the notifications drop-down
|
2011-10-08 21:27:20 -07:00 |
|
Devlon Duthie
|
fd6220fb7e
|
added sorting to drop-down notifications list, added posts to this list as well (now the counts match the items) fixed up a couple of typos
|
2011-10-08 23:24:16 -05:00 |
|
duthied
|
0963470404
|
Merge pull request #23 from duthied/master
+posts to the notifications page
|
2011-10-08 20:52:31 -07:00 |
|
Devlon Duthie
|
8eedbf30f1
|
added posts to network section of the notifications page
|
2011-10-08 22:45:48 -05:00 |
|
Friendika
|
91bc2fc9b6
|
Merge branch 'pull'
|
2011-10-08 18:38:14 -07:00 |
|
duthied
|
999f284ed1
|
Merge pull request #22 from duthied/master
testbubble theme tweak
|
2011-10-08 17:38:22 -07:00 |
|
Devlon Duthie
|
dfc65f1502
|
fix for z-index on wall-to-wall avatars in testbubble theme
|
2011-10-08 19:32:40 -05:00 |
|
Friendika
|
fe0ac848d5
|
Merge branch 'pull'
|
2011-10-08 15:23:53 -07:00 |
|
Friendika
|
43973e455a
|
revup
|
2011-10-08 15:23:19 -07:00 |
|
duthied
|
986c31c7b8
|
Merge pull request #21 from duthied/master
notification page and drop-down fixes
|
2011-10-08 15:00:11 -07:00 |
|
Devlon Duthie
|
2cba65bd38
|
fix for 'show all notifications' on notifications drop-down to handle installations in sub-directories + fix for friend notifications (eg: joe became friends with sam)
|
2011-10-08 16:57:00 -05:00 |
|
Friendika
|
2474531451
|
bug #175 - hide_help config option not working
|
2011-10-08 02:05:33 -07:00 |
|
Friendika
|
1d05c564d4
|
missing arg to diaspora_transmit from share/unshare
|
2011-10-07 15:49:41 -07:00 |
|
duthied
|
72af2d610b
|
Merge pull request #20 from duthied/master
Notifications page improvements + testbubble theme tweaks
|
2011-10-06 23:29:44 -07:00 |
|
Devlon Duthie
|
f5fc8dabe5
|
Anne set testbubble banner to be fixed, I added the other notification types to /notifcations, added link to notifcations drop-down for all notifications and added notifications drop-down to testbubble theme
|
2011-10-07 01:25:08 -05:00 |
|
Friendika
|
2802c142cb
|
local_deliver testing
|
2011-10-06 19:10:57 -07:00 |
|
Friendika
|
53efeb8d1f
|
local deliver 1
|
2011-10-06 17:27:37 -07:00 |
|
Friendika
|
272b838233
|
revup
|
2011-10-06 17:26:27 -07:00 |
|
Friendika
|
e232c50c9e
|
check author url to see if it matches current contact before relay is accepted
|
2011-10-06 00:26:25 -07:00 |
|
Friendika
|
ce11d231b8
|
use strpos instead of strstr, faster
|
2011-10-05 21:04:53 -07:00 |
|
Friendika
|
d0bef869db
|
ensure D* photos only attached once
|
2011-10-05 21:02:00 -07:00 |
|
Friendika
|
4c0ee7f41f
|
bug 173
|
2011-10-05 20:48:00 -07:00 |
|
Friendika
|
ecd714ae54
|
provide ability to repair contact photo
|
2011-10-05 20:01:42 -07:00 |
|
Friendika
|
7d6a67f903
|
mostly cosmetic changes to make DB tables accurately reflect the conversation members
|
2011-10-05 19:16:05 -07:00 |
|
Friendika
|
7df6cb850e
|
Merge branch 'pull'
|
2011-10-05 15:37:17 -07:00 |
|
Friendika
|
b1e5dfad3c
|
clean up w3c validation and layout for priv mail and lang selector
|
2011-10-05 15:35:53 -07:00 |
|
Friendika
|
0b4e3a06ed
|
Merge pull request #19 from tobiasd/master
link Diaspora* to the foundation homepage
|
2011-10-05 14:16:46 -07:00 |
|
Friendika
|
09fcfe2fe7
|
Merge branch 'pull'
|
2011-10-05 13:12:43 -07:00 |
|
Friendika
|
d709225b68
|
better check for orig post author
|
2011-10-05 13:11:45 -07:00 |
|
|
|
feaba3d300
|
point Diaspora* to the foundation homepage instead of joindiaspora.com
|
2011-10-05 21:01:48 +02:00 |
|
|
|
90870d4872
|
Merge branch 'master' of git://github.com/friendika/Free-Friendika
|
2011-10-05 20:59:21 +02:00 |
|
duthied
|
5cb0b0ed45
|
Merge pull request #18 from duthied/master
tweak to notification drop-down line items in testbubble theme
|
2011-10-05 10:26:05 -07:00 |
|
Devlon Duthie
|
2d89f3b421
|
wrapped notification line item with the anchros tag instead of the inner, makes the whole line item a link (better)
|
2011-10-05 12:24:12 -05:00 |
|
duthied
|
a7559fb045
|
Merge pull request #17 from duthied/master
drop-down notification menu support added to testbubble theme
|
2011-10-05 09:38:36 -07:00 |
|
