Simon L'nu
8629d90818
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-11 21:33:06 -04:00
Simon
18ef942f62
Merge pull request #124 from simonlnu/master
...
fix dispys' css and layout
2012-03-11 17:37:29 -07:00
Simon L'nu
e9b82bb5ee
fix dispys' css and layout
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 20:36:16 -04:00
Simon L'nu
de70b2f30f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
community meta tag renamed from "ika"
* master:
2012-03-11 20:33:10 -04:00
friendica
1401f763ec
Merge branch 'pull'
2012-03-11 17:09:07 -07:00
Michael Vogel
6e7a190e91
Mail: Subject are now with working "Re:"
2012-03-12 00:22:12 +01:00
friendica
d9bee73edf
community meta tag renamed from "ika"
2012-03-11 15:50:23 -07:00
Michael Vogel
2ed6b3531e
Removing test exports
2012-03-11 23:29:59 +01:00
Michael Vogel
905ba5ba1d
Missing field in database.sql
2012-03-11 22:39:40 +01:00
Simon L'nu
6e5f837609
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-11 17:05:08 -04:00
Michael Vogel
7235d5466a
Removed changes
2012-03-11 20:24:55 +01:00
Michael Vogel
d653e27e2d
Merge commit 'upstream/master'
...
Conflicts:
view/theme/diabook/wall_item.tpl
view/theme/diabook/wallwall_item.tpl
2012-03-11 20:22:28 +01:00
Michael Vogel
ebdf484218
Added config options for the item cache and the ostatus priority
2012-03-11 19:50:51 +01:00
Michael Vogel
9ca5de8c28
Item cache now is one day.
2012-03-11 19:45:28 +01:00
Michael Vogel
739309abd0
Corrected some git problems
2012-03-11 19:41:29 +01:00
Michael Vogel
9f76d96d46
Cache: item cache now has an autodelete of old files. The pages plugin now sets a link via redirection. So posting works.
2012-03-11 19:11:25 +01:00
Michael Vogel
b879a1ddf1
Pages: Show every community page - even from foreign servers (with caching)
2012-03-11 17:45:12 +01:00
Tobias Hößl
d9cb46f0de
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-11 14:43:16 +00:00
Simon
1dad15a021
Merge pull request #123 from simonlnu/master
...
screwed up on the font-size for screen last push
2012-03-11 07:29:45 -07:00
Simon L'nu
258a8c0871
screwed up on the font-size for screen last push
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 10:29:12 -04:00
Simon L'nu
467aa66d37
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-11 10:25:39 -04:00
Simon
ac2a81a273
Merge pull request #122 from simonlnu/master
...
add some '@media handheld' types for dispys
2012-03-11 07:25:27 -07:00
Simon L'nu
fa0cb8514d
add some '@media handheld' types for dispys
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 10:24:49 -04:00
Simon
48306e1fae
Merge pull request #121 from simonlnu/master
...
fix more stuff
2012-03-11 07:15:35 -07:00
Simon L'nu
62fe48f064
fix more stuff
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 10:14:31 -04:00
Michael Vogel
eb3b211461
New plugin that shows community pages in the sidebar
2012-03-11 14:22:19 +01:00
Simon
076393c9e7
Merge pull request #120 from simonlnu/master
...
fix some stuff right away
2012-03-11 06:13:10 -07:00
Simon L'nu
57d8370376
fix some stuff right away
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 09:12:31 -04:00
Tobias Hößl
4df08433c6
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-11 11:27:47 +00:00
6cbd765e1f
Revert "OpenID: display error msg if ID URL used to register an account does not exist"
...
This reverts commit 3c16850383
2012-03-11 12:03:47 +01:00
3c16850383
OpenID: display error msg if ID URL used to register an account does not exist
2012-03-11 12:00:32 +01:00
Simon
50863a19eb
Merge pull request #119 from simonlnu/master
...
preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!
2012-03-10 22:33:40 -08:00
Simon L'nu
f7ade749b8
preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 01:32:11 -05:00
Simon L'nu
dfdf0f1335
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
bug #328
default the text template var on conversations
bug #327 - composed private message is lost if no recip specified.
revup
fixed login-fields, fixed. notofication.png, changed locations
German translation
* master:
2012-03-11 01:24:59 -05:00
friendica
5915325367
bug #328
2012-03-10 18:52:50 -08:00
friendica
d9c5d9d2eb
default the text template var on conversations
2012-03-10 15:53:36 -08:00
friendica
1bddd48661
bug #327 - composed private message is lost if no recip specified.
2012-03-10 15:50:51 -08:00
friendica
4f606ff633
Merge branch 'pull'
2012-03-10 14:45:23 -08:00
friendica
20d1a16dbb
revup
2012-03-10 14:44:43 -08:00
Michael Vogel
670b571c8a
Caching improved.
2012-03-10 18:19:00 +01:00
Michael Vogel
74b3e9f273
Enabled Caching for items. Changed color of tags in diabook.
2012-03-10 15:50:35 +01:00
tomtom84
c79cb57e1e
Merge pull request #118 from tomtom84/master
...
fixes in diabook-derivates
2012-03-10 04:24:49 -08:00
tommy tomson
0f3255467e
fixed login-fields, fixed. notofication.png, changed locations
2012-03-10 13:22:41 +01:00
Michael Vogel
e098147c24
New config options if ostatus polling should use the priority in the contacts
2012-03-10 11:29:40 +01:00
1e37477fdc
German translation
2012-03-10 10:36:20 +01:00
Michael Vogel
15916a2cb7
Mail: Removing signatures, gpg, unnecessary line breaks
2012-03-10 09:52:20 +01:00
Simon L'nu
665ad7e660
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
spec directory
allow user to set number of items to show on network page
revup
* master:
2012-03-10 00:15:29 -05:00
friendica
d50a839c04
Merge branch 'pull'
2012-03-09 19:50:45 -08:00
friendica
0e3b9097f6
spec directory
2012-03-09 19:50:31 -08:00
friendica
a374bbcf81
Merge pull request #117 from unary/issue299
...
allow user to set number of items to show on network page
2012-03-09 19:42:52 -08:00
