aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* typos in authtestfriendica2014-02-101-1/+1
|
* reversed args in update_modtime, incorrect ud_guid and ud_hashfriendica2014-02-104-5/+5
|
* Check for the correct DB name before pushing.friendica2014-02-101-1/+1
|
* add channel_notify_flags to list of things which should *not* be synced ↵friendica2014-02-101-1/+1
| | | | across nomads. You probably only want one site to send you notification emails for the same events as opposed to all of them.
* fix ambiguous result message from authtestfriendica2014-02-101-1/+1
|
* The scenario is that you're authenticated via magic-auth on a remote hub and ↵friendica2014-02-101-3/+5
| | | | you change channels locally. Next time you start an auth exchange we'll look to see if your identity changed and we should start fresh if that's the case, rather than just falling through and keeping the old credentials.
* add chanview mode to settingsfriendica2014-02-102-1/+6
|
* Merge https://github.com/friendica/red into zpullfriendica2014-02-101-1/+1
|\
| * s/Options All/AllowOverride AllThomas Willingham2014-02-101-1/+1
| |
* | getting bookmark support in tinymce is left as a FIXME. I've got something ↵friendica2014-02-103-0/+224
|/ | | | that almost works, but not quite in editor_plugin_src.js2
* more bookmark fixesfriendica2014-02-102-2/+2
|
* better bookmark escapingfriendica2014-02-102-5/+11
|
* don't add bookmark tags to naked links inside code blocksfriendica2014-02-103-1/+15
|
* since the project donate section was added to siteinfo - add a way for the ↵friendica2014-02-091-6/+12
| | | | hub admin to add in a donation section to keep the hub running.
* perform remote discovery on abook sync of nomadic clones if remote channel ↵friendica2014-02-091-0/+27
| | | | (xchan) is unknown
* backend for chatroom activity monitor - honours permissions and returns ↵friendica2014-02-091-0/+43
| | | | (json) how many in room and last chat timestamp, regardless of whether the observer is actually in the room.
* Merge pull request #307 from git-marijus/masterfriendica2014-02-103-5/+39
|\ | | | | theming chat a little
| * whitespacemarijus2014-02-101-1/+1
| |
| * moving background-color to style.cssmarijus2014-02-092-2/+2
| |
| * theming chat a littlemarijus2014-02-093-5/+39
| |
* | more XSS blockage of uploaded filesfriendica2014-02-091-1/+10
| |
* | don't allow the browser to open uploaded html/css/jsfriendica2014-02-091-1/+12
|/
* Merge https://github.com/friendica/red into zpullfriendica2014-02-091-0/+1
|\
| * Doco - abcjsplugin from OlivierThomas Willingham2014-02-091-0/+1
| |
* | fix the "every other link gets messed up" problemfriendica2014-02-091-1/+3
| |
* | Merge https://github.com/friendica/red into zpullfriendica2014-02-092-0/+5
|\|
| * Merge pull request #306 from cvogeley/masterfriendica2014-02-092-0/+5
| |\ | | | | | | Add class to bookmark links to make it better themable
| | * .Christian Vogeley2014-02-091-0/+1
| | |
| | * Add class to bookmark links to make it better them ableChristian Vogeley2014-02-091-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E.g.: css (not yet included) .bookmark-identifier{ display:none; } .bookmark:hover:before{ text-decoration:none; content:"#^"; color:#000000; background:#FFFFFF; } .bookmark:hover{ color: #FFFFFF; background: #3465A4; }
* / fix wall photosfriendica2014-02-093-2/+11
|/
* that's betterfriendica2014-02-082-1/+3
|
* 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
| | | | | |\