Commit graph

4400 commits

Author SHA1 Message Date
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
Tobias Diekershoff
feaba3d300 point Diaspora* to the foundation homepage instead of joindiaspora.com 2011-10-05 21:01:48 +02:00
Tobias Diekershoff
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
Devlon Duthie
7d5e839664 - added drop-down notification support in testbubble theme 2011-10-05 11:29:25 -05:00
Friendika
924d419378 added prepare_body hooks 2011-10-05 02:35:25 -07:00
Friendika
6c521017f5 document backward compat issue 2011-10-04 22:03:57 -07:00
Friendika
ab50521971 yikes 2011-10-04 22:00:45 -07:00
Friendika
6ff221d5a1 another typo 2011-10-04 21:53:33 -07:00
Friendika
c2d70d005b and a typo fix 2011-10-04 21:45:15 -07:00
Friendika
159d06df82 notification issue after last checkin 2011-10-04 21:43:21 -07:00
Friendika
7b648e6da8 performance enhancements 2011-10-04 18:53:56 -07:00
duthied
24595c55d7 Merge pull request #16 from duthied/master
Minor ui tweaks
2011-10-04 09:13:49 -07:00
Devlon Duthie
f7d055687e - moved the header for profile permissions out of the scrolling div
- tweaks to the testbubble theme's nav
2011-10-04 11:10:57 -05:00
Friendika
4a5079f8fb urlescape saved search terms 2011-10-04 05:19:25 -07:00
Friendika
aeb83fa063 document multi-pass mode on consume_feed 2011-10-04 04:38:58 -07:00
Friendika
a9802575df Merge branch 'pull' 2011-10-04 03:58:26 -07:00
Friendika
07b09300a9 improve feed import performance 2011-10-04 03:06:34 -07:00
Olivier Migeot
c0cda02963 Updated french locale. 2011-10-04 12:06:01 +02:00
Olivier Migeot
273594af62 Merge remote branch 'upstream/master' 2011-10-04 11:45:57 +02:00
Friendika
3deaafe320 lrdd attributes for zot changed 2011-10-04 01:47:19 -07:00
Friendika
dfd5cc57c2 tagmatch available to anon, add paging variable to query 2011-10-03 14:47:18 -07:00
Friendika
c6ac438735 item_store: prevent storing a duplicate item with same uri+uid 2011-10-03 06:04:17 -07:00
Friendika
e4b4c1e9f8 Merge pull request #15 from fabrixxm/master
some work on quattro theme and a little fix to JS
2011-10-03 05:17:00 -07:00
Friendika
8edab80673 add tagmatch 2011-10-03 05:10:15 -07:00
Friendika
7091173131 removing another potential way a post could have a zero parent. 2011-10-03 02:39:19 -07:00
Friendika
60147d893c ?f did not have = after it 2011-10-03 01:58:01 -07:00
Fabio Comuni
209958a584 move call to ping before call to update_* 2011-10-03 09:39:41 +02:00
Fabio Comuni
4d5580ab77 fix typo 2011-10-03 09:38:58 +02:00
Fabio Comuni
b476575a98 quattro: add comment box 2011-10-03 09:38:17 +02:00
duthied
8bfd405bee Merge pull request #14 from duthied/master
templated 'find similar' content + extended match content in testbubble theme
2011-10-02 23:49:16 -07:00
Devlon Duthie
f84c208ac5 broke 'find similar' matches content into a tpl in core, added an extended tpl to testbubble that lists the profile tags 2011-10-03 01:45:27 -05:00
Fabio Comuni
2465b3274a Merge remote-tracking branch 'friendika/master' 2011-10-03 08:13:40 +02:00
Friendika
297ab898b7 Merge branch 'pull' 2011-10-02 19:04:11 -07:00
duthied
13007716d2 Merge pull request #13 from duthied/master
message tab styling - to set as active depending on url
2011-10-02 18:46:02 -07:00
Devlon Duthie
da53ebf4b3 added activetab var to message.php for templates
(testbubble only) added logic to photo header to make tab 'sticky' (active class for styling)
(testbubble only) css fix for avatars in wallitems
2011-10-02 20:37:47 -05:00
Friendika
9c681de787 Merge branch 'pull' 2011-10-02 17:31:36 -07:00
duthied
65e981c4b0 Merge pull request #12 from duthied/master
testbubble photo album image tweaks
2011-10-02 17:24:45 -07:00
Devlon Duthie
8e38fe6f47 Merge branch 'master' of http://github.com/friendika/Free-Friendika 2011-10-02 18:39:53 -05:00
Devlon Duthie
f6f5e5b993 aspect ratio fixes for photos in testbubble theme
some other testbubble styling tweaks
2011-10-02 18:38:08 -05:00
Friendika
8f9656da92 basic support for AS friend requests 2011-10-02 16:18:01 -07:00
Friendika
7c1968907d attack of the zombie orphans 2011-10-02 05:32:05 -07:00
Friendika
8c9a6b0512 fix notifications duepuntozero 2011-10-02 02:46:54 -07:00