Commit graph

64 commits

Author SHA1 Message Date
redmatrix
97e8275dc2 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-29 22:19:44 -07:00
redmatrix
0b347ccc14 turn the connection filter into a feature. 2015-06-29 20:35:56 -07:00
redmatrix
63f2e9b412 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	include/zot.php
	mod/connedit.php
	util/messages.po
2015-06-28 22:33:13 -07:00
redmatrix
de13497333 no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool. 2015-06-28 21:16:56 -07:00
redmatrix
be0459a98b convert the abook fields 2015-06-14 21:08:00 -07:00
redmatrix
851f2f64df Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	index.php
	mod/setup.php
2015-05-24 15:50:05 -07:00
Alexandre Hannud Abdo
d37c51ef2e Fix accepting contacts by using correct jquery calls.
Not sure what the operation on disabled is supposed to do, but
it also seemed to requier prop instead of attr.

See for reference:
http://api.jquery.com/prop/
"""
The checked attribute value does not change with the state of the checkbox,
 while the checked property does.
"""
2015-05-22 10:15:29 -03:00
friendica
6679734135 Merge branch 'master' into tres
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
2015-04-23 19:49:41 -07:00
friendica
3a45206b99 default perms not being set in some cases 2015-04-14 16:22:33 -07:00
friendica
3fd2e4b716 program the affinity slider labels 2015-04-09 19:51:58 -07:00
friendica
4b348d2489 Merge branch 'master' into tres
Conflicts:
	view/css/mod_events.css
	view/theme/redbasic/css/style.css
2015-02-05 19:38:43 -08:00
friendica
0357180164 remove extra debugging 2015-02-03 23:33:06 -08:00
friendica
17ffe122b3 ratings - mopping up, most everything but directory sync implemented 2015-02-03 18:10:55 -08:00
friendica
1807db6cb0 send rating information to directories 2015-02-02 20:13:07 -08:00
friendica
fa710106e5 sign the ratings, fix the bugs 2015-02-02 17:58:51 -08:00
friendica
e6a5f78003 Merge branch 'master' into tres
Conflicts:
	include/zot.php
2015-01-31 00:50:20 -08:00
friendica
3e22de0be0 how did that stuff merge? grrrr.... 2015-01-29 18:17:24 -08:00
friendica
43f5fbddc6 enable ratings only in this branch until we're ready to push 2015-01-29 15:21:50 -08:00
friendica
df6d54c64e Merge branch 'master' into pocorate 2015-01-29 15:21:19 -08:00
friendica
e2edc2c968 disable ratings until we're a bit further along. It's all changing. 2015-01-29 15:17:50 -08:00
friendica
912be23e16 Merge branch 'master' into tres
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
2015-01-29 15:09:35 -08:00
friendica
fd0b6c967f Merge branch 'master' into pocorate 2015-01-29 00:28:23 -08:00
friendica
a496036066 local_user => local_channel 2015-01-28 20:56:04 -08:00
friendica
1ef2d1c5c4 updates to put rating info into the local xlink before sending it to known directory servers 2015-01-28 16:52:17 -08:00
friendica
ac594183c6 Merge branch 'master' into tres and add some work on the item_deleted flag refactor
Conflicts:
	include/attach.php
	include/onedirsync.php
	include/zot.php
	mod/locs.php
2015-01-26 18:27:03 -08:00
friendica
0125e9d288 Hide all the scary decision making stuff that sends intellectually challenged beings into siezures and brain melt-downs and online freak-outs. 2015-01-25 14:06:57 -08:00
friendica
4ca2ec7638 rework the new connection stuff so we don't need a "permissions have been changed but not saved" message. 2015-01-25 13:30:40 -08:00
friendica
29436081a8 slow progress removing bitfields on item table 2015-01-21 16:06:25 -08:00
friendica
597b07e8cc poco rating - add a test module for pulling out ratings 2015-01-15 17:32:41 -08:00
friendica
e7932d97a2 editing stuff for poco reputation 2015-01-15 16:37:47 -08:00
friendica
1c9299ed42 more backend work on poco rating 2015-01-15 14:05:18 -08:00
friendica
2f9fe0280e document the pros and cons of the not-yet written hassle-free connection auto-permission setting. 2015-01-12 17:20:28 -08:00
friendica
962c6207ae double perms msg 2015-01-12 11:25:48 -08:00
friendica
580c30f516 another attempt to explain default permissions on connedit page 2015-01-11 21:18:29 -08:00
friendica
10102ac2ac connection clone issues 2015-01-10 14:59:10 -08:00
friendica
ce953e2f41 syncing connections issue, incorrect return_url after deleting connection 2015-01-07 14:35:03 -08:00
friendica
31648d65c8 some work on the edit connection workflow explanation and connedit page. This needs a lot more attention, but it was screaming for any improvement in documenting why we tell you that the permissions have been changed but not saved. 2015-01-02 19:20:52 -08:00
Thomas Willingham
78c37bc325 Put dir back - the fat lady didn't sing afterall. 2014-12-04 01:34:58 +00:00
Thomas Willingham
460d379e7e Don't allow affinity of 0 in connedit. 2014-12-02 00:59:20 +00:00
Habeas Codice
ac27db22c1 Merge remote-tracking branch 'upstream/master'
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
2014-11-13 13:06:31 -08:00
Habeas Codice
1a5a5c7edb PostgreSQL support initial commit
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)
2014-11-13 12:21:58 -08:00
friendica
1896855c85 minor adjustments to make the form work as designed 2014-11-04 17:38:49 -08:00
friendica
d5d6158973 ok heads up - potentially destabilising change. I've tried to sort out all 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).
2014-11-04 17:11:02 -08:00
friendica
583b445bc0 add "repository" permissions role and make sure we have a sane "accept" default for the custom role. 2014-10-27 16:19:30 -07:00
friendica
4014093572 implement permission roles - the backend should be done except for maybe a 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. 2014-09-17 17:59:46 -07:00
friendica
50da5bd389 Friendica photo import tool. This will bring in all your photos from the chosen Friendica account and import them into Red. Note that profile photos will also be imported, but will not be scaled for profiles, nor will they be attached to any profiles. They will appear however in your Profile Photos album. Photos that had any access restrictions in Friendica will be made private to only you. Comments and likes, captions, and tags are not transferred, only the actual photos. You will only be able to do this once. If something goes wrong but any photos were imported, a pconfig called frphotos.complete will be set and you'll have to remove it to start over. If you should remove this to start over, we also check each photo and will not over-write a photo you already brought over. 2014-08-12 18:08:31 -07:00
friendica
50be78d7dc fix ignore of unapproved connection 2014-08-07 20:42:49 -07:00
friendica
8da548344b clone sync of "unfriend" actions 2014-08-05 17:47:17 -07:00
friendica
c8829e7243 we didn't need the extra query - everything we require is already in memory 2014-07-29 19:52:19 -07:00
friendica
60e7837f00 implement the new friend activity post which has been missing for some time now 2014-07-29 19:26:17 -07:00