friendica
|
41d595d5bc
|
Merge branch 'pull'
|
2012-03-15 16:39:21 -07:00 |
|
friendica
|
7684f63ecd
|
track whether contact is a community page or not
|
2012-03-15 16:38:26 -07:00 |
|
Michael Vogel
|
b5120888cf
|
html2bbcode: Disabled size conversion
|
2012-03-15 21:17:51 +01:00 |
|
Michael Vogel
|
9243c9fc14
|
Merge commit 'upstream/master'
|
2012-03-15 21:11:58 +01:00 |
|
friendica
|
110e8f2919
|
basic ssl_policy for important modules
|
2012-03-14 21:20:20 -07:00 |
|
friendica
|
f0a62d8908
|
ssl_policy stuff
|
2012-03-14 20:36:23 -07:00 |
|
friendica
|
4972d7ef6e
|
more work on filer, comment level and file tag removal
|
2012-03-13 20:46:37 -07:00 |
|
friendica
|
be48fff157
|
file as widget and basic filing implementation for duepuntozero,slackr
much more work needed - this is just for test/evaluation currently
|
2012-03-13 18:13:03 -07:00 |
|
friendica
|
acc4bbeb6e
|
Merge pull request #129 from CatoTH/master
CSRF-Protection and minor changes
|
2012-03-13 14:36:52 -07:00 |
|
friendica
|
5a41676465
|
initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term, and theming.
|
2012-03-13 04:04:26 -07:00 |
|
Tobias Hößl
|
59766b944c
|
Some security against XSRF-attacks
|
2012-03-12 20:17:37 +00:00 |
|
Tobias Hößl
|
9574f7df03
|
Merge branch 'master' of git://github.com/friendica/friendica
|
2012-03-12 19:06:45 +00:00 |
|
friendica
|
3bc990f718
|
more save to file backend
|
2012-03-11 21:32:11 -07:00 |
|
friendica
|
93058af4fc
|
backend for "save to file" feature
|
2012-03-11 20:19:56 -07:00 |
|
Michael Vogel
|
6e7a190e91
|
Mail: Subject are now with working "Re:"
|
2012-03-12 00:22:12 +01:00 |
|
Michael Vogel
|
2ed6b3531e
|
Removing test exports
|
2012-03-11 23:29:59 +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
|
9ca5de8c28
|
Item cache now is one day.
|
2012-03-11 19:45:28 +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 |
|
Tobias Hößl
|
4df08433c6
|
Merge branch 'master' of git://github.com/friendica/friendica
|
2012-03-11 11:27:47 +00:00 |
|
friendica
|
5915325367
|
bug #328
|
2012-03-10 18:52:50 -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 |
|
Michael Vogel
|
e098147c24
|
New config options if ostatus polling should use the priority in the contacts
|
2012-03-10 11:29:40 +01:00 |
|
Michael Vogel
|
15916a2cb7
|
Mail: Removing signatures, gpg, unnecessary line breaks
|
2012-03-10 09:52:20 +01:00 |
|
Michael Vogel
|
11c29e0cba
|
Merge commit 'upstream/master'
|
2012-03-09 11:41:23 +01:00 |
|
Tobias Hößl
|
635958e11d
|
Merge branch 'master' of git://github.com/friendica/friendica
|
2012-03-09 10:00:12 +00:00 |
|
friendica
|
312c175045
|
bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed
|
2012-03-09 00:31:17 -08:00 |
|
friendica
|
2050f886cc
|
keep tony from talking to himself
|
2012-03-08 21:14:41 -08:00 |
|
friendica
|
395a9530dc
|
still getting parent relays on remote systems
|
2012-03-07 18:23:55 -08:00 |
|
friendica
|
dd3b3c2454
|
revup
|
2012-03-07 15:54:37 -08:00 |
|
friendica
|
7ad2dd6565
|
fix photos after permissions_sql change
|
2012-03-06 17:52:00 -08:00 |
|
friendica
|
1224e256b1
|
Merge branch 'pull'
|
2012-03-06 17:22:13 -08:00 |
|
friendica
|
88cd5800cf
|
[privacy] rework latest fix
|
2012-03-06 17:21:14 -08:00 |
|
Simon L'nu
|
415ca107fd
|
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
fix html reshares when editplain in use
* master:
|
2012-03-06 18:38:44 -05:00 |
|
Simon
|
1fae778421
|
Merge pull request #94 from beardy-unixer/master
Documentation changes
|
2012-03-06 15:24:15 -08:00 |
|
Simon
|
decc9e5798
|
Merge pull request #99 from tomtom84/master
fixes in theme diabook
|
2012-03-06 15:22:55 -08:00 |
|
tommy tomson
|
6a5c4bab9c
|
messages-menu translation, add scroll-to-top and theme-bug-report in theme
|
2012-03-07 00:07:27 +01:00 |
|
friendica
|
8fb0ea4048
|
bugs #312, #313
|
2012-03-06 14:27:53 -08:00 |
|
Thomas
|
67456bad06
|
Fixed...merged with mainline THEN added beards.
|
2012-03-06 20:50:38 +00:00 |
|
Thomas
|
a265afe7eb
|
added beard smileys
|
2012-03-06 20:44:53 +00:00 |
|
friendica
|
eec4cff84b
|
remove "smilie" expansion for Diaspora logo
|
2012-03-06 04:28:45 -08:00 |
|
friendica
|
23718bfc25
|
prevent duplicate likes
|
2012-03-06 02:17:55 -08:00 |
|
friendica
|
c37ffd2999
|
can_write_wall documentation
|
2012-03-05 15:04:43 -08:00 |
|
friendica
|
fba089012a
|
correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode
|
2012-03-04 18:50:32 -08:00 |
|
friendica
|
4134fd3dce
|
unused replacement variable displays %1 in all html2bbcode 'code' blocks
|
2012-03-04 16:26:16 -08:00 |
|
Fabio Comuni
|
685686b3e8
|
template proc: fix variables regexp
|
2012-03-03 00:00:38 +01:00 |
|
Fabio Comuni
|
aef737f376
|
template proc: allow isolation of var name between [ and ]
$var.name -> $[var.name]
|
2012-03-02 15:53:48 +01:00 |
|
Fabio Comuni
|
0bf087c895
|
template proc: remove unused function and commented out code
|
2012-03-02 12:36:22 +01:00 |
|
Fabio Comuni
|
60e5dda1b5
|
template proc: first optimization
|
2012-03-02 12:24:35 +01:00 |
|