aboutsummaryrefslogtreecommitdiffstats
path: root/include/identity.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into tresredmatrix2015-05-141-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-131-1/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: boot.php include/api.php include/enotify.php
| | * product was a bad string to use because we may require it for e-commerce, ↵redmatrix2015-05-131-1/+1
| | | | | | | | | | | | and RED_PLATFORM is equally problematic for other reasons.
| * | convert ITEM_WALL from bitfield to standaloneredmatrix2015-05-061-2/+1
| | |
| * | second pass name changeredmatrix2015-05-051-2/+2
| |/
* | Merge branch 'master' into tresfriendica2015-04-231-233/+207
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css
| * Correcting reported Doxygen syntax warnings.Klaus Weidenbach2015-03-291-227/+200
| | | | | | | | | | | | | | Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
| * provide a site-wide expiration policy without loopholes - still need work to ↵friendica2015-03-241-3/+1
| | | | | | | | reduce the impact of expiration queries.
| * add reddress to profile - but all is not as it seems. Copy to clipboard is ↵friendica2015-03-071-4/+7
| | | | | | | | blocked because it isn't really a reddress and won't work if you copy it and try and use it somewhere. We should really convert the symbol back to '@' on copy and allow it to be copied, but this isn't as easy as it sounds and is left as an exercise for the community. If we just allow it to be copied we'll get a lot of bugs that making friends doesn't work. It does, but that isn't a legitimate reddress and even if we made allowances for it, Diaspora and Friendica and other webfinger based services wouldn't and would just say it can't be found or it's an illegal address. So if we block copy we'll just get bugs that it can't be copied. Eventually somebody will see this checkin and take it on themselves to figure out how to fix the address when copied to clipboard and then allow it to be copied. And there will be joy.
| * support rel=me on channel "homepage" urlfriendica2015-02-241-1/+1
| |
* | Merge branch 'master' into tresfriendica2015-02-051-0/+4
|\| | | | | | | | | | | Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css
| * remote rating and addition of rate-me to channel profile sidebarfriendica2015-02-041-4/+2
| |
| * first cut at rating widget. The flaw is that it is limited because it ↵friendica2015-02-041-0/+6
| | | | | | | | requires local_channel() (formerly local_user()). We need to extend this to take you home like rpost does if you're logged in as remote_channel() - and/or we need zot to send the rating message to the source channel and target in addition to the directories.
* | Merge branch 'master' into tresfriendica2015-01-291-21/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php
| * remote_user => remote_channelfriendica2015-01-281-4/+4
| |
| * local_user => local_channelfriendica2015-01-281-20/+20
| |
* | start on item_restrict conversionfriendica2015-01-221-2/+1
| |
* | heavy lifting converting item flag bitsfriendica2015-01-221-2/+1
| |
* | working through the xchan table to remove bitfields, mostly complete except ↵friendica2015-01-201-4/+4
| | | | | | | | for updating the updater
* | that should take care of the bitfields in hublocfriendica2015-01-201-2/+2
|/
* Allow tags in mail, many profile fields, and admin infoStefan Parviainen2015-01-131-13/+1
|
* Merge remote-tracking branch 'upstream/master'Christian Vogeley2015-01-111-1/+4
|\ | | | | | | | | | | Conflicts: doc/html/classRedmatrix_1_1Import_1_1Import-members.html doc/html/classRedmatrix_1_1Import_1_1Import.js
| * Don't show links to edit alternate profiles if multi_profiles is disabledStefan Parviainen2014-12-301-1/+4
| |
* | Fix for issue #763 Error creating new channel within the limits of theChristian Vogeley2015-01-111-1/+1
|/ | | | subscription plan
* Show tags in other channels profile field to make it easier to navigate to ↵Stefan Parviainen2014-12-071-3/+14
| | | | the channels
* implicit boolean, formattingHabeas Codice2014-11-201-2/+2
|
* Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-131-1/+20
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: boot.php include/dba/dba_driver.php include/diaspora.php include/follow.php include/session.php include/zot.php mod/photos.php mod/ping.php
| * issue #683 - don't linkify homepage field without validatingfriendica2014-11-101-0/+2
| |
| * some minor cleanup of unreported (and as yet undiscovered) issues with ↵friendica2014-11-051-0/+2
| | | | | | | | permissions toggling. No smoking guns and no obvious issues discovered here. Repeated and tried to duplicate zottell's issue as described without seeing any obvious problems.
| * ok heads up - potentially destabilising change. I've tried to sort out all ↵friendica2014-11-041-1/+16
| | | | | | | | | | | | | | | | | | | | the default connection permissions for those who don't have a predefined (or therefore have a "custom") permissions role. Unfortunately this includes most people that were using this software more than a month ago. The real changes are that the SELF address book entry no longer holds "auto-permissions" but instead holds your "default permissions" (if you have a pre-defined role, the defaults will be pulled from the role table). The auto permissions have moved to a pconfig (uid.system.autoperms). A DB update will move these settings into their new homes. What used to be the "Auto-permissions settings" page is now the "default permissions settings" page and a checkbox therein decides whether or not to apply the permissions automatically. A link to this page will only be shown when you have the "custom" role selected. With luck nobody will notice anything wrong. But at least for the next few days, please review permissions that have been assigned to new connections (either automatically or manually) and make sure they make sense (e.g. they aren't "nothing"). You still need to take action when seeing a message "permissions have changed but not yet submitted" as we always let you review and perhaps adjust the settings _before_ a connection is established (unless you have autoperms turned on).
* | PostgreSQL support initial commitHabeas Codice2014-11-131-10/+10
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
* several unrelated things - auto_follow wasn't working for new accounts, ↵friendica2014-10-271-0/+2
| | | | error returned in private mention to a collection, and added auto-completion to photo tags; though it only matches people so the hover text is now wrong. Also made the photo edit form XHTML (XML) compliant.
* private forum issuesfriendica2014-10-211-1/+2
|
* this is the reason Diaspora forum tagging was brokenfriendica2014-10-141-3/+4
|
* disable email notifications when bulk importing content.friendica2014-10-081-0/+32
|
* Changed default avatars to PNG as agreed with Mike here: ↵Jeroen2014-10-051-1/+1
| | | | https://redmatrix.nl/channel/jeroenpraat/?f=&mid=83603d8f0876c040efafce87755fcd252dbe8da4a75d82fdb230519e3c8dcb72@redmatrix.nl. Added a few new. You can set it like this: util/config system default_profile_photo red_avatar
* That's a string, not an integerThomas Willingham2014-10-031-1/+1
|
* Set timezone when creating a channel.Thomas Willingham2014-10-031-3/+4
|
* issues with diaspora comment signatures on relayed comments that are relayed ↵friendica2014-10-021-0/+11
| | | | through a redmatrix site (parent post is redmatrix) and involve a private post.
* only auto-follow the site recommendations if creating the first channel for ↵friendica2014-10-011-1/+11
| | | | an account.
* ability to pre-populate connections for new channels. e.g. "MySpace Tom"friendica2014-10-011-1/+10
|
* Merge remote branch 'upstream/master'habeascodice2014-09-281-0/+16
|\
| * some background work for import/export of things and liked things/profilesfriendica2014-09-271-0/+16
| |
* | Typo in regex causes runtime errorhabeascodice2014-09-281-1/+1
|/
* optionally include wall items (posts) in import/exportfriendica2014-09-251-3/+4
|
* usability tweaksfriendica2014-09-171-2/+6
|
* channel permission rolesfriendica2014-09-171-5/+5
|
* implement permission roles - the backend should be done except for maybe a ↵friendica2014-09-171-8/+53
| | | | couple of small tweaks. Now we just need to define the rest of the roles and create a chooser for them. Adam started on this some time back but I don't know where that has gone.
* use the more portable encoded_item format for exported items - but with ↵friendica2014-09-161-12/+6
| | | | added attributes so we can use it as a reasonably complete item backup. The encoded_item format gives us extended author and owner information in case we need to probe them to bring the entry back. It also contains taxonomy entries. Importing and/or recovering will best be accomplished in chunks. It could take some time and some memory to chew through this.
* channel export with itemsfriendica2014-09-151-1/+35
|