friendica
a512d1a4aa
tinymce still seems to be referenced. Can't quite get rid of it.
2014-10-13 03:15:03 -07:00
friendica
8d27482374
Merge https://github.com/friendica/red into pending_merge
2014-10-13 03:08:58 -07:00
friendica
7abaccaf7f
bring back PM upload functionality and why oh why are we still loading tinymce?
2014-10-13 03:07:36 -07:00
marijus
8406046c5b
fix connedit > collection > checkbox position also for webkit - this will need a better solution though
2014-10-13 11:58:49 +02:00
friendica
6e238ce5af
context check
2014-10-12 21:59:22 -07:00
friendica
41b74dd7ac
diaspora_send_status() - recalculate markdown translation to pickup any later message changes after original submission like wall-to-wall attributions for instance. Normally this would've come from our cached version which was stored prior to tag_deliver being run and therefore isn't yet aware that wall-to-wall status may have changed after delivery.
2014-10-12 21:20:08 -07:00
friendica
084cddb32c
Merge https://github.com/friendica/red into pending_merge
2014-10-12 18:00:01 -07:00
friendica
1f976fbfe6
bit of cleanup of hidden_configs. This is a start - we've got hundreds more.
2014-10-12 17:59:03 -07:00
RedMatrix
b1ea4f9e11
Merge pull request #636 from dawnbreak/RedDAV
...
Moved classes from reddav.php into own files.
2014-10-13 09:59:01 +11:00
friendica
1dfd74fe39
Merge https://github.com/friendica/red into pending_merge
2014-10-12 15:20:22 -07:00
friendica
718bea5d45
cleanup of sync_locations and better logging. There was one significant code change but it is unrelated to current issues, basically if no primary was set we were setting everything as primary.
2014-10-12 15:18:49 -07:00
Klaus
5aae5862f2
A fix, but I have no case to verify.
...
I could not find out under which conditions this is relevant and therefore have no test case, but it must be of instance RedDAV\RedFile.
2014-10-12 21:10:04 +02:00
marijus
030175bde6
fix connedit > collection > checkbox position
2014-10-12 14:31:51 +02:00
friendica
4bf758cc5b
content deletion issue
2014-10-12 01:40:48 -07:00
Paolo T
56f6f696bd
Merge pull request #6 from tuscanhobbit/master
...
Fast forward local hub
2014-10-12 09:15:39 +02:00
Paolo T
44c4c9c5c2
Merge pull request #4 from friendica/master
...
Fast forward local hub
2014-10-12 09:07:35 +02:00
Klaus Weidenbach
dc4593f5b5
Moved classes from reddav.php into own files.
...
Finished moving classes out from include/reddav.php into own files. Also
continued with namespace for RedDAV.
Improved some docs and added some todos and fixmes.
2014-10-12 00:33:37 +02:00
Thomas Willingham
fd00a24957
Some more previously undocumented configs.
2014-10-11 18:37:07 +01:00
Thomas Willingham
82232c6916
Show tag in siteinfo. Not useful for us, quite useful for admins.
2014-10-11 17:24:58 +01:00
Thomas Willingham
b84b2d5aa5
FFS, another oops
2014-10-11 16:19:36 +01:00
Thomas Willingham
d46fd7917f
Fix webpages. Sycning between too many codebases...
2014-10-11 16:18:15 +01:00
Thomas Willingham
d196e71962
Also that doesn't work anymore - prettyPhoto relic
2014-10-11 15:48:30 +01:00
Thomas Willingham
2b472b2b48
Give Redbasic the -styled back
2014-10-11 15:45:00 +01:00
Thomas Willingham
d54d62b601
Merge branch 'master' of https://github.com/friendica/red
2014-10-11 15:42:52 +01:00
Thomas Willingham
d132646915
Unbreak webpages
2014-10-11 15:42:31 +01:00
Jeroen
2ddd022540
+1
2014-10-11 14:39:56 +00:00
Thomas Willingham
2e2f101e0b
Doco: Hidden configs - you won't believe what happens next!
...
Covered the P's, still need to do the X and just the configs. Work in
progress, so not linked from the index yet.
2014-10-11 15:15:55 +01:00
friendica
3d0d36b2bc
fix diaspora reshare tags
2014-10-10 19:14:37 -07:00
friendica
f26cd5a636
ah yes, the redundant relay run was for the benefit of wall-to-wall posts issue #633
2014-10-10 15:17:32 -07:00
friendica
b5f91d7b40
missing source route after edit
2014-10-10 14:45:18 -07:00
friendica
82d4d156ea
Merge https://github.com/friendica/red into pending_merge
2014-10-10 14:12:03 -07:00
friendica
0991a5a494
remove remnants of old signing structure - now using diaspora_meta
2014-10-10 14:11:13 -07:00
friendica
aae1d11de8
reset route to parent route on Diaspora comments flowing upstream so they won't be rejected going downstream
2014-10-10 14:04:05 -07:00
friendica
5bfde82258
make sure diaspora comments get the correct route
2014-10-10 13:56:31 -07:00
marijus
f8aabd376b
and more missing wrappers
2014-10-10 16:54:12 +02:00
marijus
d5ceb33f6d
found more missing wrappers
2014-10-10 16:13:44 +02:00
marijus
92cc5673cc
one more oups...
2014-10-10 16:01:14 +02:00
marijus
675f5caded
oups... that was weired...
2014-10-10 15:57:10 +02:00
marijus
4e9bd8b8f0
This is a fix to not interfere the ongoing adding of .generic-content-wrapper with the ongoing styling of redbasic theme.
...
adding of .generic-content-wrapper is needed and useful for derivative themes but it should not contain any styling information for redbasic theme. therefor i added .generic-content-wrapper-styled as a quickfix for spots where redbasic is not finished yet.
Sidenote: please avoid opening a div in one *.tpl and close it in another or (even worse) open a div in a *.tpl and close it in an already templatified mod/*.php. This will really make the code and templates very, very confusing.
2014-10-10 15:52:56 +02:00
Jeroen
053e606108
Merge branch 'master' of https://github.com/friendica/red
2014-10-10 13:37:09 +00:00
Jeroen
1dda775969
Good compromise I think. Remove display setting . Set the default (light) schema to = , so that other schemas can still use .
2014-10-10 13:35:16 +00:00
zzottel
f2335448f4
Merge pull request #632 from zzottel/master
...
more updates to German strings plus email templates
2014-10-10 14:57:25 +02:00
zottel
8fe0fbf6fe
more updates to German strings plus email templates
2014-10-10 14:54:41 +02:00
zzottel
113eb25cc7
Merge pull request #631 from zzottel/master
...
remove unused email template files
2014-10-10 11:45:51 +02:00
zottel
2790d9f146
remove unused email template files
2014-10-10 11:42:46 +02:00
zzottel
2b02bf9aa4
Merge pull request #630 from zzottel/master
...
update to German strings
2014-10-10 09:42:24 +02:00
zottel
3a90d037f9
update to German strings
2014-10-10 09:41:14 +02:00
friendica
cde244ef74
improvement in source route checking when handling complex *upstream* delivery chains, which were not adequately accounted for in the earlier checkin.
2014-10-10 00:13:46 -07:00
friendica
8e7e488ffe
doc updates
2014-10-10 00:13:00 -07:00
friendica
4634049549
allow (our own) ajax urls to pass through bbcode intact.
2014-10-09 20:59:33 -07:00
