Commit Graph
7799 Commits
Author SHA1 Message Date
friendica 2dfd9dce05 Merge pull request #90 from beardy-unixer/master
Add access policy to admin panel.
2013-08-08 22:38:11 -07:00
friendica 3fe5a1c6b6 donate link 2013-08-08 20:57:15 -07:00
friendica 085eec4869 malformed ru string file 2013-08-08 03:28:42 -07:00
friendica 6b7c720673 Merge pull request #91 from pixelroot/master
modified:   view/ru/messages.po
2013-08-08 03:16:26 -07:00
pixelroot 0335e0fffc modified: view/ru/messages.po 2013-08-08 11:54:03 +02:00
friendica 4cda133e89 Add public visibility setting to privacy groups (collections). This doesn't yet make them visible, but allows them to be visible (like a Cc: instead of a Bcc:) 2013-08-07 17:51:10 -07:00
Thomas Willingham ea6f5d429d Unbork webpage permissions - missed this because most of my channel_ids are 1. 2013-08-07 22:04:05 +01:00
Thomas Willingham 81a0683aaf Add access policy to admin panel. 2013-08-07 20:15:18 +01:00
friendica 38d9cf4327 remove some un-needed code 2013-08-07 03:54:47 -07:00
friendica 20b22421d3 big changes to photo->store() which is now photo->save() and takes an array instead of a list of args. Also the beginning of the migration to using photo_flags to indicate special purpose photos such as profile photos and contact photos and "thing" photos. 2013-08-07 01:42:45 -07:00
friendica 809a53a2f8 This is an actual arrowhead, the nabla is a math operator. 2013-08-06 20:04:57 -07:00
friendica 5d7a36649e wee bit of css cleanup 2013-08-06 18:26:57 -07:00
friendica 99bd0712b6 Add a site access policy (to determine if this is really a public site or just an open site) and add an orphan flag to xchans in case all their hublocs go away. Get rid of a couple of DO NOT EDIT template messages which were still lurking in the tree. 2013-08-06 17:15:41 -07:00
friendica 687ea0ca24 ru string update 2013-08-06 16:10:37 -07:00
friendica 026c93ddf2 Merge pull request #89 from pixelroot/master
modified:   view/ru/messages.po
2013-08-06 16:12:16 -07:00
pixelroot fa297b8d6e modified: view/ru/messages.po 2013-08-06 14:37:55 +02:00
pixelroot 9f649b4d95 modified: view/ru/messages.po 2013-08-06 13:53:09 +02:00
friendica 24b9799dca convert all stored json calls to json_decode_plus() 2013-08-06 03:54:49 -07:00
friendica 71347bb9e0 we've been storing json_encoded structures on disk in several places because it's a lot easier to parse than xml - but OMG do they get mangled - stored as single quoted strings when escaped as if double quoted. We need to use my new function json_decode_plus() wherever we need to parse one of these babies to make sure we get it right. Maybe we should've just used serialize(). 2013-08-06 03:29:57 -07:00
friendica 576b815f9b add extra logging to tag_deliver 2013-08-05 21:42:55 -07:00
friendica d467544bb7 fine tuning the error checks 2013-08-05 20:46:25 -07:00
friendica 790c6507d5 keep total of imported xchans correct - even if one or mail failures occur 2013-08-05 20:36:05 -07:00
friendica d5e873f549 more error checking in case import_xchan fails 2013-08-05 20:32:58 -07:00
friendica 18f8fcf9e7 use url part of array 2013-08-05 20:20:34 -07:00
friendica 9cb10b8a94 put rotated/compressed logs (.gz) into ignore list 2013-08-05 20:17:02 -07:00
friendica 8d2debca7e prune old suggested channels 2013-08-05 20:15:33 -07:00
friendica c2f97f7490 populate initial suggestions (ultimately we want to do this at install time as well as from the poller so that new sites have friend suggestions when they create their first channel). 2013-08-05 20:08:35 -07:00
friendica 089e915be1 Merge https://github.com/friendica/red into zpull 2013-08-05 17:34:15 -07:00
friendica c965ed2bb6 enotify: localize things we know how to translate 2013-08-05 17:32:33 -07:00
Thomas Willingham 290cdf81d6 Issue #88 2013-08-05 17:29:18 +01:00
friendica c86dfd2e0c directory server sitelist module (needed for public site list and building friend suggestions for new sites/channels with no known contacts) 2013-08-04 21:20:03 -07:00
friendica e265a943c8 js_upload is wretched, but at least fix the HTML in the template so it will work again. 2013-08-04 20:21:50 -07:00
friendica ad36ccdbc8 progress on unfriending 2013-08-04 19:09:53 -07:00
friendica 159a347c01 Merge https://github.com/friendica/red into zpull 2013-08-04 17:19:29 -07:00
friendica 68d907803a basic *account* removal, but the channel removal which it calls still needs (lots of) work. Oh and the intro table is no longer used and won't be - so it's gone. 2013-08-04 17:17:00 -07:00
Thomas Willingham a8409379c3 Template boo-boo 2013-08-04 20:09:57 +01:00
friendica 1b7b53f409 don't show connections with removed xchans - as there isn't much to see 2013-08-04 05:12:11 -07:00
friendica 6e23865533 $yoursite/~foo has taken you to foo's channel page for ages. If you're logged in locally, $yoursite/~ will now take you to *your* channel page. If you aren't logged in, it won't. 2013-08-04 01:04:05 -07:00
friendica e6a8bb211c connect link in directory 2013-08-03 16:35:55 -07:00
friendica 8a7fea45cc doc updates 2013-08-03 00:41:40 -07:00
friendica a40f806875 Merge https://github.com/friendica/red into zpull 2013-08-03 00:38:32 -07:00
friendica a5f751915a Merge pull request #87 from cvogeley/master
includes/bbcode.php:check if bbcode tag exists before executing regexes
2013-08-03 00:41:16 -07:00
friendica 156a0af30e rev update 2013-08-03 00:38:02 -07:00
Christian Vogeley 4e447bb7e8 change back mod to 644 2013-08-03 01:31:11 +02:00
friendica 0c51b2560a Make Zot a bit more prominent in the README 2013-08-02 16:08:24 -07:00
Christian Vogeley f09ac4e597 Revert "Revert "merge""
This reverts commit 9294f72adb.
2013-08-03 00:18:14 +02:00
Christian Vogeley 9294f72adb Revert "merge"
This reverts commit c0cd147a3a, reversing
changes made to d2d1e54bfe.
2013-08-03 00:14:59 +02:00
Christian Vogeley c0cd147a3a merge 2013-08-03 00:04:26 +02:00
friendica 1d816ba90a basic email invitations - and doc update 2013-08-02 03:45:40 -07:00
friendica ae5cd53e1e potentially fixes the "federation" bug w/r/t/ tagged forums 2013-08-01 21:24:55 -07:00