 friendica
|
ddcc0ad567
|
dav issue
|
2014-10-08 16:47:30 -07:00 |
|
|
friendica
|
15a17280d9
|
Merge https://github.com/friendica/red into pending_merge
|
2014-10-08 15:59:04 -07:00 |
|
|
friendica
|
bca4d540e0
|
disable email notifications when bulk importing content.
|
2014-10-08 15:15:20 -07:00 |
|
|
RedMatrix
|
5fa1753108
|
Merge pull request #622 from solstag/master
update pt-br translation
|
2014-10-09 08:53:58 +11:00 |
|
|
RedMatrix
|
6f2bf5162c
|
Merge pull request #627 from tuscanhobbit/dev
The simplest way to hide hubs in statistics
|
2014-10-09 08:53:47 +11:00 |
|
|
friendica
|
202039d389
|
don't double-encode hashtags
|
2014-10-08 14:47:24 -07:00 |
|
 tuscanhobbit
|
9edaa2843b
|
it's probably better to return an int type in json
|
2014-10-08 19:03:07 +02:00 |
|
|
tuscanhobbit
|
c7c76cf221
|
The simplest way to hide hubs in statistics
|
2014-10-08 18:56:42 +02:00 |
|
 Jeroen
|
29faf955f6
|
Small fix so search field and search buttons fit well.
|
2014-10-08 13:17:56 +00:00 |
|
 marijus
|
9a1c3f10b2
|
Merge branch 'master' of https://github.com/friendica/red
|
2014-10-08 15:09:54 +02:00 |
|
|
marijus
|
0dcbebba77
|
css fix
|
2014-10-08 15:09:31 +02:00 |
|
|
friendica
|
1fc3138c37
|
soundcloud using a slightly different oembed mechanism - react accordingly
|
2014-10-08 06:09:15 -07:00 |
|
|
RedMatrix
|
98af2de9b4
|
Merge pull request #626 from habeascodice/master
regex missing terminator char
|
2014-10-08 23:30:24 +11:00 |
|
|
marijus
|
096fbdb31c
|
make nav-pills a bit smaller in height
|
2014-10-08 13:18:17 +02:00 |
|
|
marijus
|
289f57f79e
|
template for searchbox and some more work on saved searches
|
2014-10-08 12:36:26 +02:00 |
|
|
marijus
|
634c2ef8ce
|
nav pills for apps aside
|
2014-10-08 10:07:19 +02:00 |
|
|
marijus
|
38e37d8d68
|
Merge branch 'master' of https://github.com/friendica/red
|
2014-10-08 09:49:21 +02:00 |
|
|
marijus
|
e05c0a8bc4
|
make author link bold again
|
2014-10-08 09:24:34 +02:00 |
|
|
RedMatrix
|
b52d575e95
|
Merge pull request #625 from letterbomber/master
put back local file check so body is fetched from z_ functions
|
2014-10-08 18:14:27 +11:00 |
|
 nostupidzone
|
9d5129de34
|
put back local file check so body is fetched from z_ functions
|
2014-10-07 23:59:26 -07:00 |
|
|
marijus
|
e5d346cdc6
|
css fixes
|
2014-10-08 08:45:59 +02:00 |
|
|
friendica
|
ee6c53c2e5
|
add imagick version check when guessing mimetype. It probably isn't important here, but let's make sure we have the right driver installed if we do something else with photos afterward.
|
2014-10-07 21:16:30 -07:00 |
|
|
friendica
|
2975c6dd43
|
stylish_select wants to attach itself to the root html element. Since it still has some serious issues, don't let it attach itself to anything.
|
2014-10-07 21:06:23 -07:00 |
|
|
friendica
|
b595f9d3ee
|
log the recursive reshare from hell at logger_debug until we get through this mess.
|
2014-10-07 20:42:57 -07:00 |
|
|
friendica
|
fa75d43b81
|
add "stacked pills" to saved search term list (the delete icon is still a bit funky)
|
2014-10-07 20:31:15 -07:00 |
|
|
Jeroen
|
d94f6f7c53
|
Schema option for bgcolour and underline yes/no on hover for the left aside.
|
2014-10-07 22:52:44 +00:00 |
|
|
friendica
|
14d538c793
|
check the imagick version before using it.
|
2014-10-07 15:14:06 -07:00 |
|
|
Jeroen
|
563163523d
|
Schema option for making links bold again. https://redmatrix.nl/display/d09d1cd2dbc45866beb9c0d384c9dcefe799d1251e3394d12ddb2e34d2c26228@red.mariovavti.com
|
2014-10-07 21:48:42 +00:00 |
|
|
RedMatrix
|
f08626fd70
|
Merge pull request #623 from letterbomber/master
add ability to skip broken imagemagick on shared hosting
|
2014-10-08 06:28:17 +11:00 |
|
|
nostupidzone
|
60a89670f6
|
add ability to skip broken imagemagick on shared hosting
|
2014-10-07 09:54:27 -07:00 |
|
|
marijus
|
21eae4df9c
|
porting more widgets to bs nav-pills
|
2014-10-07 18:11:36 +02:00 |
|
 Alexandre Hannud Abdo
|
f8704f4105
|
update pt-br translation
|
2014-10-07 12:58:01 -03:00 |
|
|
marijus
|
bf01685463
|
remove this - some widgets still need to be converted to bs-pills though
|
2014-10-07 15:03:27 +02:00 |
|
|
marijus
|
d1dea61b79
|
take away some boldness, some css fixes and some photo work
|
2014-10-07 13:09:30 +02:00 |
|
|
RedMatrix
|
9df4ceb746
|
Merge pull request #621 from solstag/master
datetimepicker data-format now data-date-format
|
2014-10-07 17:55:28 +11:00 |
|
|
Alexandre Hannud Abdo
|
55a937375d
|
datetimepicker data-format now data-date-format
|
2014-10-07 02:47:06 -03:00 |
|
|
friendica
|
c6e86ae0d9
|
Merge https://github.com/friendica/red into pending_merge
|
2014-10-06 21:38:15 -07:00 |
|
|
friendica
|
ac77076135
|
Make a best guess at how to pull the attribution from the recursive reshare from hell.
|
2014-10-06 21:37:02 -07:00 |
|
|
Jeroen
|
b0e4e01c57
|
Merge branch 'master' of https://github.com/friendica/red
|
2014-10-07 04:20:44 +00:00 |
|
|
Jeroen
|
90d0fed39d
|
Rainbow_man with alpha channel turns out very ugly in the directory for some hosts. Reset to rainbow_man with alpha, with alpha to rainbow_man_trans. Did the same for red_koala to be sure. You now have a red_koala_trans too.
|
2014-10-07 04:20:24 +00:00 |
|
|
RedMatrix
|
ae915df0a5
|
Merge pull request #620 from dawnbreak/RedDAV
Moved RedBrowser class from reddav.php to it's own file.
|
2014-10-07 15:17:19 +11:00 |
|
|
friendica
|
bbf88cf639
|
found one bug trying to fetch the recursive reshare from hell. I still think there's a problem with attribution but we'll have to wait and find that once we have some content to track. Also in private messages, on the message list page, change the text from delete message to delete conversation, because that's what we're really doing.
|
2014-10-06 20:54:52 -07:00 |
|
|
friendica
|
03585b8f88
|
SQL error - private message conversation lookup
|
2014-10-06 19:37:51 -07:00 |
|
|
friendica
|
5da8e56f25
|
Merge https://github.com/friendica/red into pending_merge
|
2014-10-06 17:47:34 -07:00 |
|
|
friendica
|
03bbbdaf10
|
shareable design elements
|
2014-10-06 17:47:17 -07:00 |
|
 Klaus
|
a9c0454b6b
|
Merge pull request #619 from dawnbreak/master
We have no submodules, so no need for .gitmodules file.
|
2014-10-07 01:41:55 +02:00 |
|
|
friendica
|
6e4f7383f1
|
Merge https://github.com/friendica/red into pending_merge
|
2014-10-06 15:16:46 -07:00 |
|
|
friendica
|
dc6b789871
|
Merge https://github.com/friendica/red into pending_merge
|
2014-10-06 15:02:48 -07:00 |
|
|
friendica
|
5236516145
|
install doc double escapes the store/[data] path.
|
2014-10-06 15:01:55 -07:00 |
|
|
RedMatrix
|
7577227a6d
|
Merge pull request #618 from solstag/master
new version of moment.js to match datetimepicker
|
2014-10-07 09:01:54 +11:00 |
|