friendica
|
2b38936cde
|
Merge pull request #309 from beardy-unixer/master
Clear out old notifications in the poller.
|
2014-02-12 08:30:06 +11:00 |
|
Thomas Willingham
|
2d9655627a
|
Clear out old notifications in the poller.
|
2014-02-11 20:14:45 +00:00 |
|
friendica
|
841f3922aa
|
typos in authtest
|
2014-02-10 20:40:12 -08:00 |
|
friendica
|
59094cda51
|
reversed args in update_modtime, incorrect ud_guid and ud_hash
|
2014-02-10 20:38:26 -08:00 |
|
friendica
|
74fb7d158b
|
Check for the correct DB name before pushing.
|
2014-02-10 19:20:55 -08:00 |
|
friendica
|
7f741a7e85
|
add channel_notify_flags to list of things which should *not* be synced across nomads. You probably only want one site to send you notification emails for the same events as opposed to all of them.
|
2014-02-10 19:18:09 -08:00 |
|
friendica
|
dfcb863c70
|
fix ambiguous result message from authtest
|
2014-02-10 18:20:23 -08:00 |
|
friendica
|
e6185eea28
|
The scenario is that you're authenticated via magic-auth on a remote hub and 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.
|
2014-02-10 15:39:19 -08:00 |
|
friendica
|
12319c41e3
|
add chanview mode to settings
|
2014-02-10 15:14:03 -08:00 |
|
friendica
|
b757bbea4e
|
Merge https://github.com/friendica/red into zpull
|
2014-02-10 14:42:13 -08:00 |
|
friendica
|
bf09fc9bbe
|
getting bookmark support in tinymce is left as a FIXME. I've got something that almost works, but not quite in editor_plugin_src.js2
|
2014-02-10 14:37:50 -08:00 |
|
Thomas Willingham
|
35a3b2d8eb
|
s/Options All/AllowOverride All
|
2014-02-10 21:36:19 +00:00 |
|
friendica
|
54a89eb410
|
more bookmark fixes
|
2014-02-10 03:31:26 -08:00 |
|
friendica
|
a7fa14800d
|
better bookmark escaping
|
2014-02-10 01:44:21 -08:00 |
|
friendica
|
a76c53657b
|
don't add bookmark tags to naked links inside code blocks
|
2014-02-10 01:11:59 -08:00 |
|
friendica
|
eb96a04d34
|
since the project donate section was added to siteinfo - add a way for the hub admin to add in a donation section to keep the hub running.
|
2014-02-09 20:08:29 -08:00 |
|
friendica
|
c7ffae03d8
|
perform remote discovery on abook sync of nomadic clones if remote channel (xchan) is unknown
|
2014-02-09 19:45:22 -08:00 |
|
friendica
|
cf3b76c046
|
backend for chatroom activity monitor - honours permissions and returns (json) how many in room and last chat timestamp, regardless of whether the observer is actually in the room.
|
2014-02-09 16:47:06 -08:00 |
|
friendica
|
9f6d0a2676
|
Merge pull request #307 from git-marijus/master
theming chat a little
|
2014-02-10 10:02:13 +11:00 |
|
friendica
|
b58baa5e4a
|
more XSS blockage of uploaded files
|
2014-02-09 15:00:47 -08:00 |
|
marijus
|
3ad9cf67c6
|
whitespace
|
2014-02-10 00:00:35 +01:00 |
|
marijus
|
46153e4a57
|
moving background-color to style.css
|
2014-02-09 23:59:19 +01:00 |
|
friendica
|
b92f00587b
|
don't allow the browser to open uploaded html/css/js
|
2014-02-09 14:56:52 -08:00 |
|
marijus
|
4fc0126661
|
theming chat a little
|
2014-02-09 23:52:09 +01:00 |
|
friendica
|
66e7d182d4
|
Merge https://github.com/friendica/red into zpull
|
2014-02-09 13:47:00 -08:00 |
|
friendica
|
8727a75437
|
fix the "every other link gets messed up" problem
|
2014-02-09 13:46:40 -08:00 |
|
Thomas Willingham
|
8bf7b0fffd
|
Doco - abcjsplugin from Olivier
|
2014-02-09 18:09:50 +00:00 |
|
friendica
|
6387921000
|
Merge https://github.com/friendica/red into zpull
|
2014-02-09 00:31:16 -08:00 |
|
friendica
|
c5f0b85357
|
fix wall photos
|
2014-02-09 00:30:43 -08:00 |
|
friendica
|
96881e8330
|
Merge pull request #306 from cvogeley/master
Add class to bookmark links to make it better themable
|
2014-02-09 18:49:31 +11:00 |
|
Christian Vogeley
|
176b0881ce
|
.
|
2014-02-09 01:39:37 +01:00 |
|
Christian Vogeley
|
c9192991c9
|
Add class to bookmark links to make it better them able
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;
}
|
2014-02-09 01:37:09 +01:00 |
|
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 |
|