 friendica
|
e346aa7560
|
that's better
|
2014-02-08 12:08:07 -08:00 |
|
|
friendica
|
e71571f619
|
revert last fix, it double tags
|
2014-02-08 12:02:45 -08:00 |
|
|
friendica
|
4a5c1441e1
|
Merge https://github.com/friendica/red into zpull
|
2014-02-08 11:56:32 -08:00 |
|
|
friendica
|
92dea7888b
|
allow somebody to type #^{{naked link}}
-- auto-linkify it and create a bookmark tag.
|
2014-02-08 11:53:47 -08:00 |
|
|
friendica
|
7ca2e97a5f
|
Merge pull request #305 from beardy-unixer/master
Pass mids to conv_item template
|
2014-02-09 06:51:00 +11:00 |
|
 Thomas Willingham
|
3222b15485
|
Pass mids to conv_item template
|
2014-02-08 17:49:09 +00:00 |
|
|
friendica
|
97739920eb
|
create a new "subdued" CSS class for things that shouldn't be in your face unless you want them and intentionally hover over them. Typically this would be accomplished via an opacity or colour change, but themes are free to use other methods. Also changed the channel_tabs "chatroom" link to use the subdued class if no rooms have been created rather than a count of chatrooms. Themse should probably create a .subdued and .subdued:hover definition because we'll probably take most of the stuff which is now hardwired to use opacity by id and change it to use the class definition instead.
|
2014-02-08 00:48:19 -08:00 |
|
|
friendica
|
ecac985e33
|
make bookmarks message into an 'info' so it expires and goes away after a bit
|
2014-02-07 23:33:40 -08:00 |
|
|
friendica
|
8c845f5d50
|
set default for account_level in DB
|
2014-02-07 22:47:03 -08:00 |
|
|
friendica
|
ae6bd7dc1e
|
fix issue with double linkify in the git feed
|
2014-02-07 15:41:31 -08:00 |
|
|
friendica
|
1ec7ffc774
|
Merge https://github.com/friendica/red into zpull
|
2014-02-07 13:40:26 -08:00 |
|
|
friendica
|
63589d4f2e
|
from olivier: use double quotes in js strings, updated FR translation
from me: provide future ability to have an optional edit link/icon next to menus (such as bookmarks)
|
2014-02-07 13:39:13 -08:00 |
|
|
friendica
|
a3c8178703
|
Merge pull request #304 from git-marijus/master
let oneself be added to a collection in exchange for deleted contacts
|
2014-02-08 08:00:55 +11:00 |
|
 marijus
|
4c0f9a91b9
|
Merge branch 'upstream'
|
2014-02-07 21:35:18 +01:00 |
|
|
marijus
|
f62ec4132e
|
let oneself be added to a collection in exchange for deleted contacts
|
2014-02-07 21:28:39 +01:00 |
|
|
marijus
|
fd1c444c45
|
Merge branch 'master' of https://github.com/friendica/red into upstream
|
2014-02-07 20:47:55 +01:00 |
|
 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 |
|