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
Friendika
c72883f068
malformed xml in ping
2011-10-02 01:21:51 -07:00
Friendika
7059b8378c
Merge pull request #11 from duthied/master
...
Aspect ratio improvement for photos in album, implemented only in testbubble theme
2011-10-01 23:36:23 -07:00
Friendika
7d7a149811
db updates for server batch key caching, group visibility
2011-10-01 23:19:20 -07:00
Friendika
96e735fdd2
zot protocol update
2011-10-01 18:54:48 -07:00
Friendika
0ad9e7b5f4
option to not post photos to status stream
2011-10-01 06:20:41 -07:00
Friendika
8f47540e9b
darkbubble - event legibility
2011-10-01 04:37:28 -07:00
Friendika
78c00c287d
legibility improvements to darkbubble, mark as a derived theme
2011-10-01 04:25:40 -07:00
Friendika
f4c961b906
override pragma
2011-10-01 02:22:48 -07:00
Devlon Duthie
c15690563d
class and wrapper div added to photo for aspect ratio display
...
testbubble theme styling for aspect ratio on photos
2011-10-01 01:52:06 -05:00
Friendika
8fb2d02d3d
typo last checkin
2011-09-30 18:00:32 -07:00
Friendika
0508ccf50f
restore photo cache
2011-09-30 17:47:33 -07:00
Fabio Comuni
60e0f79b9f
Merge remote-tracking branch 'friendika/master'
2011-09-30 14:31:20 +02:00
Fabio Comuni
dfb3ee6e29
fix star icon viewing profile page as unlogged user
2011-09-30 14:31:01 +02:00
Friendika
30b7c68929
Merge pull request #10 from duthied/master
...
UI work on testbubble theme + core tpl files
2011-09-30 00:56:24 -07:00
Devlon Duthie
6f610eb614
1. added button class to tpl files
...
2. messages - moved delete X into message div and new message form div
3. began work on creating thumbnail versions of albums - needs aspect ratio correction (javascript)
4. changed font-size and font-variation on vcard for better readability.
5. streamlining continued with the CSS file
2011-09-30 01:01:15 -05:00
Friendika
52557b011d
possible sql errors
2011-09-29 21:56:44 -07:00
Friendika
097c1f8da7
do not poll for abandoned accounts
2011-09-29 21:20:19 -07:00
Friendika
c1221cc052
add display_item hook to 'search|new' message display
2011-09-29 15:52:31 -07:00
Friendika
bc98930537
Merge branch 'pull'
2011-09-29 15:33:12 -07:00
Friendika
c68569040e
added back for photos page until we can get rid of it cleanly
2011-09-29 15:32:16 -07:00
Tobias Diekershoff
e88a8564c8
Merge branch 'master' of git://github.com/friendika/Free-Friendika
2011-09-29 09:07:27 +02:00
Tobias Diekershoff
dd316ef6f6
Merge pull request #9 from tobiasd/6cf5da1e4bc43d8446f5789bc93f82673ec64c2e
...
German strings
2011-09-29 00:06:23 -07:00
Tobias Diekershoff
47f38bc3ab
Merge branch 'master' of git://github.com/friendika/Free-Friendika
2011-09-29 09:03:30 +02:00
Tobias Diekershoff