marijus
|
02c08d0cda
|
fixes rconnect button for bs-default scheme
|
2014-04-14 21:47:00 +02:00 |
|
marijus
|
d371ad3da7
|
a small fix for bs-default scheme
|
2014-04-14 21:10:48 +02:00 |
|
friendica
|
bf8f5d5b2b
|
directory: make "connect" more prominent, but this ultimately needs more theme work.
|
2014-04-14 02:37:04 -07:00 |
|
friendica
|
4feeacb51b
|
until we can figure out how to allow commenting on the discover page without killing the matrix, just turn it off.
|
2014-04-13 20:26:20 -07:00 |
|
friendica
|
bc041bdb77
|
profperm: abook_profile was being handled by profile id rather than profile_guid, causing private profiles to not be activated in many cases.
|
2014-04-13 19:57:47 -07:00 |
|
friendica
|
769b0f6bc9
|
Often somebody will join the matrix with a dodgy cert and we'll sort that out but their profile photo will remain rainbow man (or the site default). However the photo_date has been updated so we won't try again. This checkin looks for such a failure and leaves the photo_date alone if the photo import failed.
|
2014-04-13 18:30:06 -07:00 |
|
friendica
|
73f459b68d
|
Merge https://github.com/friendica/red into pending_merge
|
2014-04-13 18:08:15 -07:00 |
|
friendica
|
e3aa7d2aaf
|
only show forum tags on contact autocomplete, not in the ACL selector
|
2014-04-13 18:07:19 -07:00 |
|
friendica
|
08435e5b1a
|
minor alignment issues
|
2014-04-13 16:07:47 -07:00 |
|
sirius
|
8b8feea12f
|
Added hackish support for permissions-sync between profile and profile-pictures
|
2014-04-14 00:45:24 +02:00 |
|
Thomas Willingham
|
153cc599a3
|
Merge pull request #411 from beardy-unixer/master
Tony has been near the Git again.
|
2014-04-13 19:27:19 +01:00 |
|
Thomas Willingham
|
abcd835bf0
|
Tony has been near the Git again.
|
2014-04-13 19:25:41 +01:00 |
|
RedMatrix
|
581e999f6c
|
Merge pull request #407 from tonybaldwin/master
added spoiler tag to bbcode help doc
|
2014-04-13 18:16:37 +10:00 |
|
RedMatrix
|
fe1ecbd012
|
Merge pull request #408 from beardy-unixer/master
Update sabre
|
2014-04-13 18:16:04 +10:00 |
|
friendica
|
dc1a529b63
|
remove extra tag logging
|
2014-04-12 23:57:19 -07:00 |
|
friendica
|
4fda10db2f
|
don't match quote remnants
|
2014-04-12 17:04:54 -07:00 |
|
friendica
|
d7aaff459f
|
let normal hashtags be quoted strings also
|
2014-04-12 16:58:19 -07:00 |
|
friendica
|
5cb7e48dad
|
major cleanup of handle_tag()
|
2014-04-12 15:53:52 -07:00 |
|
Thomas Willingham
|
cdc8454cf1
|
Update sabre
|
2014-04-12 18:13:37 +01:00 |
|
tony baldwin
|
9919d109fd
|
added breaks after added bbcode spoiler line
|
2014-04-12 08:44:28 -04:00 |
|
tony baldwin
|
e8de088037
|
added spoiler tag to bbcode help doc
|
2014-04-12 08:40:48 -04:00 |
|
tony baldwin
|
ebd33b185d
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/css/style.css
whatever
|
2014-04-12 08:37:56 -04:00 |
|
friendica
|
2d9ab91e9f
|
Merge branch 'master' into prvtag
|
2014-04-12 03:45:46 -07:00 |
|
friendica
|
d0834c7e13
|
Merge https://github.com/friendica/red into pending_merge
|
2014-04-12 03:32:58 -07:00 |
|
friendica
|
c93353c0a3
|
we seem to have lost any install text mentioning that subdirs and alternate ports aren't supported
|
2014-04-12 03:31:55 -07:00 |
|
friendica
|
567b5d053d
|
handle new tag declarations
|
2014-04-12 03:31:24 -07:00 |
|
friendica
|
71929c6caa
|
add forum mode to tag handling
|
2014-04-12 00:56:04 -07:00 |
|
friendica
|
aa5054d5ba
|
this is looking better, call the forum version of a tag "foobar network", besides altering the icon
|
2014-04-12 00:41:36 -07:00 |
|
friendica
|
2212ddb913
|
use icons for identification
|
2014-04-11 23:54:11 -07:00 |
|
friendica
|
47096df97e
|
not quite right but I need to check it in so I can switch branches
|
2014-04-11 20:35:25 -07:00 |
|
friendica
|
2b3697c27a
|
the auto-complete part
|
2014-04-11 20:12:40 -07:00 |
|
friendica
|
f93b56de55
|
no this is the way to do it
|
2014-04-11 20:00:34 -07:00 |
|
friendica
|
c7d6179a0f
|
Use @+ to tag a forum and also restrict the post to the forum, this leaves @! tags private - period.
|
2014-04-11 16:31:48 -07:00 |
|
Thomas Willingham
|
163c83a9e5
|
Ooops, replaced too many
|
2014-04-12 00:11:43 +01:00 |
|
Thomas Willingham
|
a82b1fe590
|
Revert to prepare_text, use bbcode only for with
|
2014-04-12 00:08:50 +01:00 |
|
friendica
|
8b39b5ae4e
|
via Mario: default channel permissions not working on channel page
|
2014-04-11 15:51:25 -07:00 |
|
friendica
|
7e6804b599
|
make sure we can find that function
|
2014-04-11 15:14:01 -07:00 |
|
friendica
|
202582cbd6
|
we also need a loop breaker
|
2014-04-11 15:08:40 -07:00 |
|
RedMatrix
|
df7c2afc68
|
Merge pull request #405 from beardy-unixer/master
A few little fixes
|
2014-04-12 07:20:44 +10:00 |
|
RedMatrix
|
aa1f5ce753
|
Merge pull request #404 from git-marijus/master
bootstrapify aclselector
|
2014-04-12 07:20:24 +10:00 |
|
friendica
|
0a871c3f14
|
Merge https://github.com/friendica/red into pending_merge
|
2014-04-11 14:02:45 -07:00 |
|
friendica
|
e10509e2bd
|
soft revert 9bb7811 until we can look at it more closely.
|
2014-04-11 14:01:33 -07:00 |
|
friendica
|
2677ee0b49
|
doc update
|
2014-04-11 14:01:22 -07:00 |
|
Thomas Willingham
|
2fdcd0c27e
|
Never set background or color unless you set both. If this is needed
in future, it should probably be reimplmented with the class anyway.
|
2014-04-11 20:02:52 +01:00 |
|
Thomas Willingham
|
81b06754a4
|
Don't count deleted channels when figuring out where to send a user on login.
|
2014-04-11 15:11:22 +01:00 |
|
marijus
|
3197ccbf5e
|
bootstrapify aclselector
|
2014-04-11 16:06:39 +02:00 |
|
Thomas Willingham
|
4582b8dd64
|
Bring BBCode to profiles
|
2014-04-11 14:54:07 +01:00 |
|
Thomas Willingham
|
742e2686ca
|
Don't explicitly deny our strongest features existence.
|
2014-04-11 14:53:18 +01:00 |
|
Paolo T
|
93a56db391
|
Merge pull request #403 from tuscanhobbit/master
IT: strings updated
|
2014-04-11 14:23:52 +02:00 |
|
Paolo Tacconi
|
a36d1d5e92
|
IT: strings updated
|
2014-04-11 14:22:27 +02:00 |
|