aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* revert last fix, it double tagsfriendica2014-02-081-1/+1
|
* Merge https://github.com/friendica/red into zpullfriendica2014-02-081-0/+1
|\
| * Merge pull request #305 from beardy-unixer/masterfriendica2014-02-091-0/+1
| |\ | | | | | | Pass mids to conv_item template
| | * Pass mids to conv_item templateThomas Willingham2014-02-081-0/+1
| |/
* / allow somebody to type #^{{naked link}}friendica2014-02-081-1/+1
|/ | | | -- auto-linkify it and create a bookmark tag.
* create a new "subdued" CSS class for things that shouldn't be in your face ↵friendica2014-02-083-4/+13
| | | | 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.
* make bookmarks message into an 'info' so it expires and goes away after a bitfriendica2014-02-071-1/+1
|
* set default for account_level in DBfriendica2014-02-073-3/+10
|
* fix issue with double linkify in the git feedfriendica2014-02-071-1/+7
|
* Merge https://github.com/friendica/red into zpullfriendica2014-02-074-4023/+4213
|\
| * Merge pull request #304 from git-marijus/masterfriendica2014-02-082-6/+6
| |\ | | | | | | let oneself be added to a collection in exchange for deleted contacts
| | * Merge branch 'upstream'marijus2014-02-07115-9003/+9513
| | |\
| | | * let oneself be added to a collection in exchange for deleted contactsmarijus2014-02-072-6/+6
| | | |
| | | * Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-02-072-4017/+4207
| | | |\ | | |_|/ | |/| |
| * | | Merge pull request #303 from tuscanhobbit/masterPaolo T2014-02-072-4017/+4207
| |\ \ \ | | | | | | | | | | IT: update to the strings
| | * \ \ IT: update to the stringstuscanhobbit2014-02-070-0/+0
| | |\ \ \
| | * | | | IT: update to the stringstuscanhobbit2014-02-072-3857/+4049
| | | | | |
| | | | | * Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-02-07110-4976/+5293
| | | | | |\ | | |_|_|_|/ | |/| | | |
| | | | | * Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-02-062-4/+7
| | | | | |\
| | | | | * \ Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-02-0615-220/+213
| | | | | |\ \
| | | | * | \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-062-1/+2
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
| | | | * | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-0612-219/+152
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch 'upstream'marijus2014-02-050-0/+0
| | | | |\ \ \ \ \ | | | | | | |_|/ / | | | | | |/| | |
| | | | | * | | | Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-02-05143-3694/+5472
| | | | | |\ \ \ \
| | | | | * | | | | comment out since it is not clear if this is not implemented yet or obsoletemarijus2014-01-311-2/+2
| | | | | | | | | |
* | | | | | | | | | from olivier: use double quotes in js strings, updated FR translationfriendica2014-02-075-5104/+7623
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | from me: provide future ability to have an optional edit link/icon next to menus (such as bookmarks)
* | | | | | | | | order menu_list by description, not namefriendica2014-02-071-1/+1
| | | | | | | | |
* | | | | | | | | To be listed as a public site, you need to be an https site with a valid ↵friendica2014-02-073-2804/+2919
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | doc updatesfriendica2014-02-0799-2159/+2337
| | | | | | | | |
* | | | | | | | | missing element in new chatroom linkfriendica2014-02-061-1/+4
| | | | | | | | |
* | | | | | | | | mod/ping - don't perform any database calls if installingfriendica2014-02-061-0/+6
| | | | | | | | |
* | | | | | | | | Merge https://github.com/friendica/red into zpullfriendica2014-02-061-6/+6
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-02-072-2/+2
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Minor doco - markdown doesn't like angle brackets. Also give instructions ↵Thomas Willingham2014-02-071-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for mounting one's own directory rather than the cloud root.
* | | | | | | | | | | extend the usermenu so we don't have to keep going back to channel homepage ↵friendica2014-02-061-3/+7
| |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | to get to the other channel links
* | | | | | | | | | make all naked links bookmark-ablefriendica2014-02-062-2/+2
|/ / / / / / / / /
* | | | | | | | / apply service class restriction to the number of channels allowed in a ↵friendica2014-02-061-0/+11
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | chatroom at a time ('chatters_inroom'). If you've got a public site you probably want to restrict this.
* | | | | | | | add bookmark tag to naked links if they're red sites. We can do this because ↵friendica2014-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | notification bug - don't use $r, we already set it to something else that we ↵friendica2014-02-062-3/+6
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | need further on.
* | | | | | | leave out the quotesfriendica2014-02-061-1/+1
| | | | | | |
* | | | | | | more important things to mention. And this is still only the important stuff.friendica2014-02-062-1/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | a couple morefriendica2014-02-052-0/+3
| | | | | |
* | | | | | Merge branch 'newhomepage'friendica2014-02-052-206/+72
|\ \ \ \ \ \
| * | | | | | this is basic but perhaps that's what we really need.friendica2014-02-051-15/+62
| | | | | | |
| * | | | | | cleanup in preparation for new pagefriendica2014-02-021-196/+3
| | | | | | |
| * | | | | | some intial work on a splashier homepagefriendica2014-01-222-14/+26
| | | | | | |
* | | | | | | add chatrooms templatefriendica2014-02-051-0/+10
| | | | | | |
* | | | | | | add chatroom linksfriendica2014-02-052-1/+24
| | | | | | |
* | | | | | | fix the xchan lookup toolfriendica2014-02-051-1/+3
| | | | | | |
* | | | | | | allow bookmarks to use richtextfriendica2014-02-053-3/+6
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 17:46:10 +0000