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
6cf5da1e4b
update to the German strings
2011-09-29 09:03:06 +02:00
Friendika
6d36fab90f
reverting wall_item.tpl
2011-09-28 23:54:22 -07:00
Friendika
0ee9ae23d7
Merge pull request #8 from duthied/master
...
Classes added to core and testbubble theme
It looks to me as if view/wall_item.tpl is an earlier version that somehow didn't get merged. I don't think testbubble is using it, so I'm going to merge and then revert that one file, as I don't see any changes you made to it specifically for this body of work.
2011-09-28 23:53:05 -07:00
Devlon Duthie
0881c04cea
classes added to core + testbubble theme
...
some fixes to testbubble theme related to tab styling
2011-09-29 01:20:39 -05:00
Friendika
ffa3b67365
fix nav-selected duepuntozero
2011-09-28 23:10:23 -07:00
Friendika
26905751ea
path for country.js - now in js directory
2011-09-28 22:32:39 -07:00
Friendika
5279f99278
missing uploads on testbubble
2011-09-28 22:13:33 -07:00
Friendika
50c4077c5b
basic darkbubble - improve as needed
2011-09-28 16:22:08 -07:00
Friendika
bedb4eb715
just hostname not url in hm:host - host xrd document
2011-09-28 15:07:01 -07:00
Friendika
a1786cbf61
fixes for statusnet/identi.ca empty vcard page - which appears to be deprecated. Scrape the feed for everything we used to get from the vcard.
2011-09-28 04:35:44 -07:00
Friendika
d0f45bf281
apps broken in all themes, apps link misplaced in testbubble
2011-09-28 04:19:42 -07:00
Friendika
360a46178b
create zot batch keys
2011-09-28 03:45:48 -07:00
fabrixxm
207f739f90
Merge pull request #6 from fabrixxm/master
...
more work on ui
2011-09-28 01:35:32 -07:00
Fabio Comuni
41617ee987
fix search_item.tpl, fix 'new' view in network page, fix walltowall template in 'quattro' theme
2011-09-28 10:30:32 +02:00
Friendika
4343a73076
move connect button down a smidgin
2011-09-28 00:53:55 -07:00
Fabio Comuni
68a6bfdee5
Items lock icon
2011-09-28 09:43:31 +02:00
Fabio Comuni
c120cc8ea9
added missing "delete selected items" link
2011-09-28 09:32:53 +02:00
Fabio Comuni
3ca3157e53
ping returns notices and infos also to unlogged users
2011-09-28 09:30:22 +02:00
Fabio Comuni
dccd2da356
Merge remote-tracking branch 'friendika/master'
2011-09-28 09:27:59 +02:00
Friendika
44d7c6aac3
connect button overlapping profile details
2011-09-27 22:03:07 -07:00
Friendika
4f9c072d66
requeue deliveries on 503 errors which have 'retry-after' headers
2011-09-27 19:27:47 -07:00
Fabio Comuni
e986fc3e30
quattro: actions in wall_item
...
less html in conversation.php
removed unused tpls
fixed old themes
2011-09-27 16:54:33 +02:00
Friendika
75af366122
zot/salmon new key format for batch keys
2011-09-27 06:50:18 -07:00
Friendika
59525e1e32
restore privacy icons after theme upgrade
2011-09-27 05:24:26 -07:00
Friendika
8e02368341
Merge branch 'pull'
2011-09-27 05:04:23 -07:00
Friendika
7e2284043f
show profile url in ACL hovertips, add fork identifier to json siteinfo
2011-09-27 05:02:25 -07:00
fabrixxm
0691662f5a
Merge pull request #5 from fabrixxm/master
...
fix loozah themes navbar
2011-09-27 04:46:38 -07:00
Fabio Comuni
30df9abeac
fix loozah themes navbar
2011-09-27 13:45:25 +02:00
Friendika
1e288dc8a3
loozah theme vcard float not cleared
2011-09-27 01:32:54 -07:00
Friendika
8c6e7a24cd
Merge branch 'pull'
2011-09-27 01:29:08 -07:00
Friendika
2118dd3160
vcard elements float not cleared
2011-09-27 01:28:22 -07:00
fabrixxm
916633ba34
Merge pull request #4 from fabrixxm/master
...
missing commit :)
2011-09-27 01:21:16 -07:00
Fabio Comuni
3dca29b3d5
port old themes
2011-09-27 10:19:32 +02:00
Friendika
25ac93f44d
Merge pull request #3 from fabrixxm/master
...
Works on UI
2011-09-27 01:04:54 -07:00
Friendika
069a76bff4
Merge branch 'pull'
2011-09-27 01:00:31 -07:00
Friendika
8d3910c78c
sql error diaspora re-queue
2011-09-27 00:58:59 -07:00
Fabio Comuni
e9638b6980
Adds theme info file to define 'parent' theme from where load tpl files
2011-09-27 09:32:20 +02:00
Fabio Comuni
939449602a
Merge remote-tracking branch 'fabrix/newui'
2011-09-27 08:57:16 +02:00
Friendika
7f02617517
Merge pull request #2 from abinoam/master
...
Git url should now point to Free-Friendika repository (Thank you!)
2011-09-26 23:50:22 -07:00
Friendika
7a683c576a
Merge https://github.com/friendika/Free-Friendika into pull
2011-09-26 23:45:49 -07:00
Friendika
e04d9b8646
bug #165
2011-09-26 23:39:47 -07:00
Devlon Duthie
78c3210f6a
fixed a bug I introduced when working on the testbubble theme - user's photo widget header div wasn't closed correctly
...
+ some opera-friendly style changes
2011-09-27 00:29:34 -05:00
Abinoam P. Marques Jr.
7f6e507457
Added addon installation instruction. Exclusive repo.
2011-09-27 00:18:08 -03:00
Abinoam P. Marques Jr.
c52ef08578
Changing the git url to Free-Friendika at Install.md. It's lacking addon install instruction.
2011-09-26 23:51:46 -03:00
Abinoam P. Marques Jr.
e20ba2c271
Changing git url for Free-Friendika
2011-09-26 23:45:08 -03:00