Paolo T
|
6d1f211fab
|
Merge pull request #303 from tuscanhobbit/master
IT: update to the strings
|
2014-02-07 18:06:32 +01:00 |
|
tuscanhobbit
|
8ebd3afd64
|
IT: update to the strings
|
2014-02-07 18:04:09 +01:00 |
|
tuscanhobbit
|
917a939d46
|
IT: update to the strings
|
2014-02-07 18:02:20 +01:00 |
|
marijus
|
6dd05bb53f
|
Merge branch 'master' of https://github.com/friendica/red into upstream
|
2014-02-07 13:50:18 +01:00 |
|
friendica
|
c80325b427
|
order menu_list by description, not name
|
2014-02-07 01:49:34 -08:00 |
|
friendica
|
14fd940e08
|
To be listed as a public site, you need to be an https site with a valid cert. If you don't make the cut, you will either not be listed as a public site or you will be de-listed. Period. This is non-negotiable.
|
2014-02-07 00:50:04 -08:00 |
|
friendica
|
fb49647993
|
doc updates
|
2014-02-07 00:49:45 -08:00 |
|
friendica
|
cda1224066
|
missing element in new chatroom link
|
2014-02-06 23:10:14 -08:00 |
|
friendica
|
b779400218
|
mod/ping - don't perform any database calls if installing
|
2014-02-06 21:31:42 -08:00 |
|
friendica
|
9370cca8ad
|
Merge https://github.com/friendica/red into zpull
|
2014-02-06 16:43:55 -08:00 |
|
friendica
|
e8d98fbc85
|
extend the usermenu so we don't have to keep going back to channel homepage to get to the other channel links
|
2014-02-06 16:43:04 -08:00 |
|
Thomas Willingham
|
72218f831e
|
Merge branch 'master' of https://github.com/friendica/red
|
2014-02-07 00:25:51 +00:00 |
|
Thomas Willingham
|
be475bb0cc
|
Minor doco - markdown doesn't like angle brackets. Also give instructions for mounting
one's own directory rather than the cloud root.
|
2014-02-07 00:24:39 +00:00 |
|
friendica
|
9b2dc9b87c
|
make all naked links bookmark-able
|
2014-02-06 16:22:40 -08:00 |
|
friendica
|
a46fa1fbae
|
apply service class restriction to the number of channels allowed in a chatroom at a time ('chatters_inroom'). If you've got a public site you probably want to restrict this.
|
2014-02-06 15:23:20 -08:00 |
|
marijus
|
6f2c168d1a
|
Merge branch 'master' of https://github.com/friendica/red into upstream
|
2014-02-06 23:11:47 +01:00 |
|
friendica
|
3e677ec53d
|
add bookmark tag to naked links if they're red sites. We can do this because red links are linkified when the post is submitted. Can't do this for other naked links because they only get linkified during display and won't have a taxonomy object attached to the message.
|
2014-02-06 13:54:39 -08:00 |
|
friendica
|
f9381ed746
|
notification bug - don't use $r, we already set it to something else that we need further on.
|
2014-02-06 13:32:29 -08:00 |
|
marijus
|
a2b311991a
|
Merge branch 'master' of https://github.com/friendica/red into upstream
|
2014-02-06 14:56:59 +01:00 |
|
marijus
|
c26ae94592
|
Merge branch 'master' of https://github.com/friendica/red
|
2014-02-06 14:54:23 +01:00 |
|
friendica
|
7a522be20b
|
leave out the quotes
|
2014-02-06 01:05:22 -08:00 |
|
friendica
|
c739c43893
|
more important things to mention. And this is still only the important stuff.
|
2014-02-06 00:50:13 -08:00 |
|
marijus
|
d1bd6cdb25
|
Merge branch 'master' of https://github.com/friendica/red
|
2014-02-06 08:49:17 +01:00 |
|
friendica
|
2c451d5c28
|
a couple more
|
2014-02-05 20:53:01 -08:00 |
|
friendica
|
2479e32a42
|
Merge branch 'newhomepage'
|
2014-02-05 20:44:24 -08:00 |
|
friendica
|
5c5a14c4df
|
this is basic but perhaps that's what we really need.
|
2014-02-05 20:43:43 -08:00 |
|
friendica
|
61f3ffc635
|
add chatrooms template
|
2014-02-05 19:16:41 -08:00 |
|
friendica
|
05a70a8760
|
add chatroom links
|
2014-02-05 19:16:12 -08:00 |
|
friendica
|
cb6716a644
|
fix the xchan lookup tool
|
2014-02-05 18:51:50 -08:00 |
|
friendica
|
1b406be544
|
allow bookmarks to use richtext
|
2014-02-05 16:28:51 -08:00 |
|
friendica
|
da8a79ebfa
|
cleanup - nothing more
|
2014-02-05 16:01:02 -08:00 |
|
friendica
|
fdc0a7e95e
|
fix auto-add of bookmarks to find sender correctly and optionally auto add bookmarks for self
|
2014-02-05 15:56:18 -08:00 |
|
friendica
|
8595318089
|
Merge https://github.com/friendica/red into zpull
|
2014-02-05 15:03:46 -08:00 |
|
friendica
|
efa30f1b03
|
This would be about the 75th attempt to try and prevent duplicated email notifications for comments. Eventually we'll find something that works.
|
2014-02-05 15:01:53 -08:00 |
|
friendica
|
e525f045c1
|
Merge pull request #298 from cvogeley/master
Other not so elegant way of detecting touch screen devices
|
2014-02-06 06:44:41 +11:00 |
|
friendica
|
4a03ae09eb
|
Merge pull request #302 from git-marijus/master
add a sanitized style tag to bbcode
|
2014-02-06 06:39:36 +11:00 |
|
marijus
|
bd1849ddae
|
Merge branch 'upstream'
|
2014-02-05 14:50:38 +01:00 |
|
marijus
|
419e3b5024
|
Merge branch 'master' of https://github.com/friendica/red into upstream
|
2014-02-05 14:48:42 +01:00 |
|
marijus
|
a606fc0ba3
|
add a sanitized style tag to bbcode
|
2014-02-05 14:34:25 +01:00 |
|
marijus
|
9e993bb4fd
|
Merge branch 'master' of https://github.com/friendica/red
|
2014-02-05 13:43:16 +01:00 |
|
friendica
|
0844110f7b
|
preserve system bit when editing menus
|
2014-02-05 03:44:46 -08:00 |
|
friendica
|
24f32e55c8
|
bookmarking bugfix
|
2014-02-05 03:29:02 -08:00 |
|
friendica
|
f30a39f9df
|
bookmark debug logging
|
2014-02-05 03:15:10 -08:00 |
|
friendica
|
8a11c29413
|
make links in comments bookmark-able
|
2014-02-04 19:39:56 -08:00 |
|
friendica
|
9f439c3248
|
add icon translation for new icon
|
2014-02-04 17:14:22 -08:00 |
|
friendica
|
aede006970
|
bookmarks - mop up and go home
|
2014-02-04 17:12:13 -08:00 |
|
friendica
|
3665bc38ef
|
bookmarking
|
2014-02-04 16:06:56 -08:00 |
|
marijus
|
4253581733
|
Merge branch 'master' of https://github.com/friendica/red
|
2014-02-04 16:19:35 +01:00 |
|
friendica
|
46b9352a84
|
fix the search for system bookmarks
|
2014-02-04 01:42:43 -08:00 |
|
friendica
|
50a1ffd244
|
Merge https://github.com/friendica/red into zpull
|
2014-02-04 00:53:04 -08:00 |
|