Commit graph

11637 commits

Author SHA1 Message Date
marijus
0c2d9edd83 it seems we do not have an key called item_id here so must be id only 2014-10-15 21:15:20 +02:00
friendica
aa0aa22b8a chanman is now 'locs' and a couple of post handlers have been defined. 2014-10-14 20:33:38 -07:00
friendica
65b84e839a back to wrestling with the !@#$ diaspora recursive reshare from hell 2014-10-14 18:47:08 -07:00
friendica
5362943330 missing quote 2014-10-14 18:05:32 -07:00
friendica
2db7d88e28 this is the reason Diaspora forum tagging was broken 2014-10-14 18:02:34 -07:00
friendica
903f7e73fb if a hubloc primary change results in an xchan primary change, create a directory update packet. 2014-10-13 21:44:46 -07:00
friendica
0057612a9f figuring out how to bootstrap the change_primary procedure when all you have is inconsistent data which you think you trust. 2014-10-13 21:38:36 -07:00
friendica
79684e05cc fix import sql error 2014-10-13 21:24:06 -07:00
friendica
19e1b95837 don't use cached data 2014-10-13 21:01:51 -07:00
friendica
bd4dd85fbb there's the problem 2014-10-13 20:53:34 -07:00
friendica
8a907a789f more diagnostic when changing primary 2014-10-13 17:59:03 -07:00
friendica
3d56bb5cd7 this bug has been there for a *long* time. First time I've ever seen it triggered. 2014-10-13 16:21:02 -07:00
friendica
b740baf6a9 Merge https://github.com/friendica/red into pending_merge 2014-10-13 16:13:13 -07:00
friendica
6503b91131 sql 2014-10-13 16:12:32 -07:00
RedMatrix
b9457c06af Merge pull request #638 from dawnbreak/RedDAV
When you delete something in /cloud stay in the right folder.
2014-10-14 09:40:43 +11:00
friendica
8710496689 Merge https://github.com/friendica/red into pending_merge 2014-10-13 15:28:40 -07:00
friendica
1b0390af06 new function hubloc_change_primary() 2014-10-13 15:27:56 -07:00
Klaus Weidenbach
bc2ad74813 When you delete something in /cloud stay in the right folder.
When you deleted a file in /cloud you was always jumped back to /cloud/[channel],
now you will stay in the parent folder.
Some more doxygen documentation.
Removed duplicate data from logging output and reduced logging in RedDAV in general.
2014-10-14 00:15:41 +02:00
RedMatrix
1eefed0333 Merge pull request #637 from tuscanhobbit/dev
one more hidden config option
2014-10-14 06:36:35 +11:00
tuscanhobbit
9f95162593 one more hidden config 2014-10-13 21:29:47 +02:00
tuscanhobbit
9dc3b01959 Merge from master 2014-10-13 21:19:07 +02:00
tuscanhobbit
240cbc8798 Merge from origin 2014-10-13 21:18:59 +02:00
marijus
a7aa4efc08 Merge branch 'master' of https://github.com/friendica/red 2014-10-13 12:52:41 +02:00
marijus
c41f314302 really fix connedit > collection > checkbox 2014-10-13 12:52:21 +02:00
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