friendica
|
e12706e825
|
Merge branch 'pull'
|
2012-03-12 19:12:39 -07:00 |
|
friendica
|
acf75e85c8
|
revup
|
2012-03-12 19:12:00 -07:00 |
|
tomtom84
|
691f5b11f7
|
Merge pull request #128 from tomtom84/master
fixes in diabook-derivates
|
2012-03-12 16:40:10 -07:00 |
|
tommy tomson
|
8358b9247f
|
fix css
|
2012-03-13 00:38:38 +01:00 |
|
tomtom84
|
ecc9f4ba70
|
Merge pull request #127 from tomtom84/master
fixes in diabook-derivates
|
2012-03-12 16:06:15 -07:00 |
|
tommy tomson
|
27bc8052d0
|
use fancybox instead of lightbox
|
2012-03-13 00:04:19 +01:00 |
|
tomtom84
|
8a85914e1d
|
Merge pull request #126 from tomtom84/master
fixes in diabook-derivates
|
2012-03-12 15:33:29 -07:00 |
|
tommy tomson
|
caffb217c1
|
fixes
|
2012-03-12 23:31:54 +01:00 |
|
Simon L'nu
|
5a1e2c32fe
|
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
add lightbox, fixex in css
more save to file backend
backend for "save to file" feature
* master:
|
2012-03-12 17:12:01 -04:00 |
|
Tobias Hößl
|
59766b944c
|
Some security against XSRF-attacks
|
2012-03-12 20:17:37 +00:00 |
|
tomtom84
|
a1305433b8
|
Merge pull request #125 from tomtom84/master
fixes in diabook-derivates
|
2012-03-12 13:11:19 -07:00 |
|
tommy tomson
|
9436175746
|
add lightbox, fixex in css
|
2012-03-12 21:09:16 +01:00 |
|
Tobias Hößl
|
9574f7df03
|
Merge branch 'master' of git://github.com/friendica/friendica
|
2012-03-12 19:06:45 +00:00 |
|
Fabio Comuni
|
c30342e2f7
|
add 'loggin_out' hook
|
2012-03-12 15:58:59 +01:00 |
|
Alexander Kampmann
|
bce3bfff38
|
get tags test improved
|
2012-03-12 13:59:00 +01:00 |
|
friendica
|
38cb4a362f
|
Merge branch 'pull'
|
2012-03-12 00:57:06 -07:00 |
|
friendica
|
3bc990f718
|
more save to file backend
|
2012-03-11 21:32:11 -07:00 |
|
|
|
30f5c3a9eb
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2012-03-12 05:02:45 +01:00 |
|
friendica
|
93058af4fc
|
backend for "save to file" feature
|
2012-03-11 20:19:56 -07:00 |
|
Simon L'nu
|
9f52e3df8d
|
fix dispy-dark photo album stuff
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-11 21:34:51 -04:00 |
|
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 |
|
