Commit Graph

11075 Commits

Author SHA1 Message Date
RedMatrix 0b9adbc080 Merge pull request #575 from encyclomundi/master
change the name of the app from Channel Select to Channel Manager
2014-08-29 09:38:59 +10:00
Charles f53b1ff9bb change the name of the app from Channel Select to Channel Manager 2014-08-28 16:33:23 -07:00
marijus 9945cc7129 minor css fixes and cleanup 2014-08-28 23:05:47 +02:00
friendica f526a10f07 let's make this "specific" since that's what it is. 2014-08-28 04:14:49 -07:00
friendica d0af6b501f really really really fix lockview - maybe 2014-08-28 04:04:38 -07:00
friendica 5e5c6c9000 consistency: the diaspora post plugin uses "diaspora_enable". The protocol driver uses "diaspora_enabled" with a 'd'. They got mixed up in a couple of places. 2014-08-28 03:33:19 -07:00
friendica ed4896def1 make blocks, webpages, and layouts postable (pre-filled forms if supplied from elsewhere). The only serious issue is with ordering - you have to process and save a named layout before you can save a webpage that uses that layout name. Otherwise it will get unset during the save. 2014-08-28 01:08:42 -07:00
friendica a4f734e37c begin embeddable/shareable design elements (blocks, webpages, layouts, menus, etc.) 2014-08-27 22:56:24 -07:00
friendica 2d210db1b8 ability to create/edit/delete custom profile field definitions - read the source. Currently the created entries aren't added to the allowed fields arrays, but this can be done by hand until that bit is made available. Only choice for input type at the moment is 'text' or a text input, not a textarea. Multiple choice will be added later. 2014-08-27 22:01:02 -07:00
friendica eb27bea794 mind numbing drudgery continued... 2014-08-27 19:15:34 -07:00
friendica bbcf0be16a Admin setting for Diaspora Protocol enable. We may want to have this also at a channel level since there are privacy issues and quirks and trade-offs. 2014-08-27 18:19:56 -07:00
friendica 287ce2576f thanks thomas... 2014-08-27 17:25:11 -07:00
friendica 4a1ddc7017 Merge https://github.com/friendica/red into pending_merge 2014-08-27 16:49:07 -07:00
friendica b478fe8dff compatibility notes 2014-08-27 16:48:43 -07:00
RedMatrix 45e8419bce Merge pull request #574 from tuscanhobbit/master
Notifications links load on the same window(tab)
2014-08-27 18:15:42 +10:00
tuscanhobbit c4a2409778 notifications open in the same window(tab) 2014-08-27 09:35:17 +02:00
friendica e179dca446 place to store multiple choice and select items for extensible profiles 2014-08-26 22:37:04 -07:00
friendica 5e4298029a and ... we've got a comment coming the other way 2014-08-26 21:00:51 -07:00
friendica 8c6067b411 more hard work 2014-08-26 20:51:59 -07:00
friendica 6a42d6fe3b works one way sort of - now to go the other way - which will require fixing a whole slew of FIXMEs 2014-08-26 18:58:48 -07:00
friendica e42205cec2 houston we have liftoff 2014-08-26 17:32:51 -07:00
friendica c9d33895d5 Merge https://github.com/friendica/red into pending_merge 2014-08-26 16:35:33 -07:00
friendica 289ec34ae6 take off the kid gloves 2014-08-26 16:35:06 -07:00
marijus 2df4c44de5 make vcard and contact block widget look-alike 2014-08-27 00:59:07 +02:00
marijus 6c11fd349e Merge branch 'master' of https://github.com/friendica/red 2014-08-26 22:35:47 +02:00
marijus c703d83350 add background color to widgets 2014-08-26 22:35:00 +02:00
Thomas Willingham 450434a690 Revert - see comments. 2014-08-26 20:13:27 +01:00
Thomas Willingham cc2bef67dd HTML doesn't work without ACCOUNT_ROLE_ALLOWCODE, so don't offer it
as an option.
2014-08-26 19:09:00 +01:00
marijus 592be71626 Merge branch 'master' of https://github.com/friendica/red 2014-08-26 09:14:03 +02:00
friendica c99d89e441 get rid of template "auto generated" warnings 2014-08-25 22:58:30 -07:00
friendica 6e99848043 more diaspora stuff - most of the basic bits are there except queueing and physical delivery (I'm keeping delivery turned off until some of the bugs are fixed so we don't cause inifinite loops or network meltdowns) - now it's just a matter of going through and methodically finding all the bugs 2014-08-25 22:43:44 -07:00
friendica eb8f194419 sort out some anomalies 2014-08-25 21:42:46 -07:00
friendica 84ff380302 more diaspora heavy lifting 2014-08-25 20:57:10 -07:00
friendica df634f9853 notifications/system not marking all notifications seen 2014-08-25 20:55:37 -07:00
marijus 9e8a2a06b5 Merge branch 'master' of https://github.com/friendica/red 2014-08-25 23:09:19 +02:00
friendica 86fb165dc9 re-obscure item body if localize_item() changes it. It's already flagged as obscured so we need it to actually be obscured. 2014-08-25 02:14:48 -07:00
marijus a512f54d93 Merge branch 'master' of https://github.com/friendica/red 2014-08-25 09:34:05 +02:00
friendica e0ee66d0b4 Add d* folks to address book. WARNING - DO NOT ATTEMPT THIS. LEAVE IT THE FRUCK ALONE until the feature is stable. I won't help you if you try this and end up with a borked site. You are completely on your own. 2014-08-24 17:52:26 -07:00
marijus 5a080881c5 Merge branch 'master' of https://github.com/friendica/red 2014-08-24 14:30:12 +02:00
friendica d57c57ad59 onepoll: don't poll archived, blocked, or ignored connections 2014-08-24 05:26:00 -07:00
marijus c2d8133253 Merge branch 'master' of https://github.com/friendica/red 2014-08-24 14:22:27 +02:00
friendica 5cba209604 diaspora discovery 2014-08-24 04:27:10 -07:00
marijus f991ca8df1 Merge branch 'master' of https://github.com/friendica/red 2014-08-24 09:35:21 +02:00
friendica 9b524c9bc4 unobscure viewsrc items 2014-08-23 21:12:33 -07:00
friendica a93608391a Merge https://github.com/friendica/red into pending_merge 2014-08-23 15:23:05 -07:00
friendica 56e8b2b971 add "any connections" to can_comment_on_post() - was missing 2014-08-23 15:22:26 -07:00
Jeroen b11e9fe03c fix nl 2014-08-23 20:13:23 +00:00
Jeroen ceabf2d488 Minor adjustment photo view + update nl (at 100\%\!) 2014-08-23 17:01:19 +00:00
friendica 5d2dc4e8fd switch everything over to crypto_encapsulate() 2014-08-23 02:45:21 -07:00
marijus 8d382a9394 Merge branch 'master' of https://github.com/friendica/red 2014-08-23 07:59:12 +02:00