friendica
96afe7bf42
set to empty string so it doesn't get mis-handled as a null
2015-03-20 16:49:49 -07:00
friendica
07f8e7049a
Merge https://github.com/friendica/red into pending_merge
2015-03-20 16:47:38 -07:00
friendica
01716dea3d
config to hide version tag from siteinfo - on my site it's meaningless.
2015-03-20 16:46:07 -07:00
Mario Vavti
ead45292e1
some tabs title statuseditor restructuring
2015-03-21 00:06:18 +01:00
Mario Vavti
9a2ef38267
need the cloudpath before creating the object
2015-03-20 18:04:22 +01:00
Mario Vavti
6698d7b03a
possible improvement regarding deletion
2015-03-20 17:37:01 +01:00
friendica
274a30f2db
call parse_url from rpost and add the result to the content body if invoked with a url argument
2015-03-19 16:41:41 -07:00
friendica
b1fd6c53a5
tweaks to directory registrations which don't seem to be happening, also downgrade any directory that claims to be a primary directory for RED_GLOBAL.
2015-03-19 15:56:30 -07:00
friendica
63683734a2
make the channel item query match recent changes to network item query (and some slightly older changes in display item query), and allow '@' in linkified urls.
2015-03-18 19:06:05 -07:00
friendica
629f6bec74
ok it has to be owner.
2015-03-17 15:45:08 -07:00
friendica
7af012b1f9
The random bad signatures are because something somewhere is trimming the body text. It could be any one of hundreds of functions that touch the message body. We really want to trim the body text, so I'm putting back all the trim statements - in mod/item and item_store and item_store_update. The last fix for random bad sigs noted that one of the trims wasn't there, so the others were removed. The correct fix is for all the trims to be there. We will probably have a few (quite a few) bad sigs during the transition back to trimmed text but this should nail it for anybody on recent code and with new content.
2015-03-17 00:13:47 -07:00
friendica
bc22df9057
display a map for photos if allowed. Note: there is a bug in that if the map div starts with display:none one needs to reload the frame or zoom in or they end up at minimum resolution. Still trying to sort this out.
2015-03-16 22:06:03 -07:00
friendica
178b768e3c
openid cleanup
2015-03-16 17:08:50 -07:00
friendica
ccf4734f7b
make sure this sucker is quiet
2015-03-16 15:50:45 -07:00
friendica
52374bcd6e
phase one of the great file storage unification - use one button for uploads of any type (image or attachment). We'll sort out which one it is and deal with it appropriately.
2015-03-16 15:33:08 -07:00
friendica
6da40fc559
mod_id: load profile so the sidebar profile will work
2015-03-15 16:48:45 -07:00
friendica
6537a65053
mysql schema typo, do the install check for store before chcking smarty, as that is where the dir is created, change install doc to point to install/schema_xxxxx.sql instead of database.sql
2015-03-15 15:36:01 -07:00
friendica
cc2c7bbcd8
revert the revert - that is working. My test was bad.
2015-03-14 01:03:37 -07:00
friendica
88167718ba
revert and rethink
2015-03-14 00:51:16 -07:00
friendica
b76cdf82d2
create terms for Diaspora mention tags - which in Diaspora are handled differently than other tag links and have to be done separately; they aren't processed by linkify_tags which handles all of our other tag processing. Also move the abook_channel clause in mod_network to the join statement. This works fine in mysql and achievies the desired result. I hope postgres can handle an expression as a join clause.
2015-03-13 19:24:17 -07:00
zottel
e732fbe8e8
fix posts not showing up in network if author is not in connections
2015-03-14 00:22:47 +01:00
friendica
7d5efe88e0
use local_channel() connnections to match the abook against when joining the abook on the discover tab.
2015-03-13 15:39:19 -07:00
friendica
c412e6e640
revert that
2015-03-12 20:51:36 -07:00
friendica
93caead072
try to allow translation of ax regs
2015-03-12 20:43:53 -07:00
friendica
d60cb14c2f
support a fair number of the common AX regs
2015-03-12 20:05:43 -07:00
friendica
f2d84608af
Add some AX vars to openid server.
2015-03-12 18:48:32 -07:00
friendica
02a58dc5b0
more JS=1 weirdness
2015-03-12 16:20:29 -07:00
friendica
71f2a797cb
try and add some regs
2015-03-12 15:19:54 -07:00
Mario Vavti
d11bec6f58
add generic_addon_settings template and minor fixes
2015-03-12 22:22:52 +01:00
Mario Vavti
0905180385
Merge branch 'master' of https://github.com/friendica/red
2015-03-12 10:20:21 +01:00
Mario Vavti
8113ee1c4a
some work on feature/addon settings
2015-03-12 10:19:56 +01:00
Habeas Codice
1578c49976
substr() is a mysql alias for substring(). substring() is in the SQL standard and is supported by both
...
databases.
2015-03-12 00:28:49 -07:00
friendica
76fedfe1f8
openid stuff
2015-03-11 21:49:29 -07:00
friendica
64ae17aa6a
Merge branch 'master' into openid
2015-03-11 19:35:23 -07:00
friendica
b3a9a6c802
remove the now redundant audio/video buttons and label the editor text style buttons which didn't have them. Unused editor buttons were commented in case we need to bring them back. If things go smoothly we can remove them. Use the link icon going forward - for all links.
2015-03-11 18:56:28 -07:00
friendica
d6ce32ef78
parse_url changes for oembed/zvideo/etc.
2015-03-11 17:31:15 -07:00
friendica
a40c19d19d
Merge branch 'master' into openid
2015-03-11 01:03:30 -07:00
friendica
bfd123c59a
openid server
2015-03-11 01:03:14 -07:00
friendica
844b2ae587
cleanup of old delegation stuff
2015-03-10 20:19:17 -07:00
friendica
9d1df58759
sql optimisation for affinity searches. A new index was added which wasn't added retro-actively to existing DBs as an update. It isn't clear if this helps sites any more than just restricting the abook table to certain channel_id's is (and this field is already indexed).
2015-03-10 18:55:56 -07:00
friendica
5b35f1e6c4
Change logic of "don't create a status post for this photo upload" and turn it into a bona-fide on/off toggle. This takes up one more vertical line, but we have it to spare, and the single button (while concise visually) provided no feedback of the current state, or indicate whether a second click toggled it. Some addons use this setting so addons will need to be pulled when this is pulled in order to remain in sync.
2015-03-10 15:43:15 -07:00
friendica
3466547784
missing include
2015-03-10 02:27:10 -07:00
friendica
98dffd77ef
channel delegation
2015-03-10 02:23:14 -07:00
friendica
0134a41015
more work on queue optimisations
2015-03-09 19:57:35 -07:00
Habeas Codice
a611eed172
Whoops... should've actually checked the pg manual before merging #920 :-)
...
replace if(cond,val,val) with case when cond then val else val end, works on
both DBs
2015-03-09 17:54:14 -07:00
friendica
26a414fe4b
make network page default options work more or less universally instead of just from the navbar, and fix some saved-search weirdness related to the delete-term icon
2015-03-09 16:27:12 -07:00
friendica
16bcca6aab
up the count of directory tags
2015-03-09 15:24:05 -07:00
friendica
e7d3244276
Allow site to over-ride directory options. Bugger off.
2015-03-09 15:16:52 -07:00
friendica
aff7588832
fix comanche regions after comanche refactor a few days ago
2015-03-09 00:44:58 -07:00
habeascodice
f7d1fb9c5a
Merge pull request #920 from dawnbreak/master
...
Add alert to admin page about old PHP version. Fixing (un)blocking accounts in admin.
2015-03-08 16:51:42 -07:00
Klaus Weidenbach
c6d45858bb
Fixing (un)blocking accounts in /admin/users.
...
When I look at the instructions in sql_conventions about setting bit
flags I don't understand how this could have worked before. Changed the
behavior for (un)blocking so that it should work now.
2015-03-08 22:22:45 +01:00
Klaus Weidenbach
23ea974615
Add alert to admin page about old PHP version.
...
Add an alert message to admin summary page when a PHP version < 5.4 was
detected as this has reached EOL and will not be supported with the new
SabreDAV library.
Some styleguide optimisation.
Add NULL_DATE example to doc/sql_conventions.bb.
Display a "0" when no plugins active in summary page.
Added some more numbers to summary admin page, expired accounts,
channels. Hope I interpreted them right. I have no idea how to get
blocked accounts.
2015-03-08 17:51:58 +01:00
friendica
1351f9c81a
Merge https://github.com/friendica/red into pending_merge
2015-03-07 15:22:00 -08:00
friendica
aac4affe65
directory: fix public forum listing
2015-03-07 15:21:23 -08:00
Mario Vavti
9cd7546be5
hopefully fix #919
2015-03-07 15:56:28 +01:00
friendica
53e908d7b7
when fixing "naked links" make sure not to double link double urls as seen in archive.org - which has the complete unescaped target url, scheme and all, as part of its own.
2015-03-06 20:45:26 -08:00
friendica
73891dc582
reverse smilie storage also
2015-03-06 03:04:04 -08:00
friendica
f6da235a7d
major cleanup of directory options
2015-03-05 23:31:01 -08:00
friendica
bd4d2f3b44
make alpahabetic searches start with A
2015-03-05 19:16:50 -08:00
friendica
ea8ea5a351
reverse the logic of "don't show emoticons" setting which seems awkward
2015-03-05 18:30:15 -08:00
friendica
22391a2437
straighten out some directory stuff, which required some Comanche structural changes
2015-03-05 18:24:49 -08:00
friendica
ec5c989352
make destructive queue management functions an expert option
2015-03-05 15:53:25 -08:00
Mario Vavti
3fa4123161
only allow theme selection forms if there are any themes to select
2015-03-05 12:47:18 +01:00
Mario Vavti
beace0f57a
more yes/no labels
2015-03-05 10:20:49 +01:00
friendica
76eb0a7e56
Deprecate the "wall uploads" photo album. Photo uploads (from any source) with no album specified will go now into an album based on YYYY-MM.
2015-03-04 18:55:17 -08:00
friendica
410f3335a9
parse_url: if url returns an image/audio/video file instead of a webpage, return the bbcode for the appropriate content type. This results in two web fetches of the url in question, but the first one is just a HEAD. This way we won't try and download and parse an entire video. TODO: img's are checked to see if they should be zid-ified, but audio/video currently are not.
2015-03-04 15:17:39 -08:00
friendica
39c17adc0b
remove broken sql query from early queue manager.
2015-03-04 11:20:52 -08:00
friendica
684ce972fe
Merge https://github.com/friendica/red into pending_merge
2015-03-04 02:35:20 -08:00
friendica
fb0f823be7
provide a list of potential addons and what they do for members who can't see the descriptions on the admin/plugins page
...
Not all of these are in red-addons repository, please add any that haven't been listed. We should probably provide a list of addon repositories at the end.
2015-03-04 02:32:59 -08:00
Mario Vavti
e5e96dfbff
cleanup removeaccount
2015-03-04 11:11:36 +01:00
Mario Vavti
431a462d60
cleanup removeme
2015-03-04 11:01:16 +01:00
Mario Vavti
eceafd5777
fix wording
2015-03-04 10:26:25 +01:00
Mario Vavti
4b08ccd873
clean up account settings
2015-03-04 10:11:48 +01:00
friendica
df90677f90
add the tag hijacking preference to Diaspora settings
2015-03-03 17:43:13 -08:00
friendica
d83460cd2a
The never ending saga of parent = 0 bugs on Dreamhost.
2015-03-01 18:58:50 -08:00
friendica
bc1afbc762
Merge https://github.com/friendica/red into pending_merge
2015-03-01 15:57:56 -08:00
friendica
ba7bdd79b7
queue management actions. Still needs further work such as indication of last successful connection or indication that the hub was marked offline, but these are potentially expensive queries.
2015-03-01 15:55:27 -08:00
Mario Vavti
af06766627
provide some more yes/no labels
2015-03-01 16:59:44 +01:00
friendica
05dff886c8
don't report already delivered queue items in admin queue summary
2015-02-26 20:07:08 -08:00
friendica
a00c072f02
high level queue inspector - needs a lot more, like the ability to dump certain destinations and indicating known dead sites, but this is a start
2015-02-26 20:00:47 -08:00
friendica
2a2cc309ce
solve some (hopefully most) missing delivery issues
2015-02-25 01:39:45 -08:00
friendica
08f054130f
require access token to view, query, or join directories in private realms, if the realm is so configured.
2015-02-24 16:36:27 -08:00
friendica
1383915f86
notes about private realm registrations and multiple primary directories.
2015-02-22 22:58:09 -08:00
RedMatrix
035441550c
Merge pull request #908 from zzottel/master
...
set html title to item title in channel/mid and display pages
2015-02-21 08:29:14 +11:00
RedMatrix
912c9fdd58
Merge pull request #907 from tuscanhobbit/dev
...
Added version tag to siteinfo/json
2015-02-21 08:26:31 +11:00
zottel
48080d4103
correct indent
2015-02-20 14:11:28 +01:00
zottel
2c7e8bea88
show item title in channel/mid and display pages
2015-02-20 14:07:56 +01:00
Paolo Tacconi
2765500844
Fixes to version tag in siteinfo/json
2015-02-20 10:29:33 +01:00
Paolo Tacconi
5aad4a19f8
Added version tag to siteinfo/json
2015-02-20 10:09:59 +01:00
friendica
3ea77f0c10
INSTALL: 'store' is created during setup but not 'store/[data]/smarty3' and we explicitly check for the latter and report that it isn't there or isn't writable. Doh.
2015-02-19 15:14:14 -08:00
friendica
e00be4de23
The Diaspora communications policies allow comments to public posts literally from anybody. Allow this policy model by default for commenters from that network. This policy decision can be set or disabled on the addon/features settings page.
2015-02-17 19:47:36 -08:00
friendica
533f39debe
bring back like/dislike summaries on photos
2015-02-16 17:01:13 -08:00
friendica
b4f639239f
mopping up the public site ratings
2015-02-16 11:09:12 -08:00
friendica
a1c4bbfa5c
quick fix for photos page until calls to like_puller() are fixed
2015-02-16 01:22:11 -08:00
friendica
eb3c5916d7
pubsites ratings (mod/pubsites really really needs to be templatised, this was quick and dirty)
2015-02-16 01:17:15 -08:00
friendica
1c4b919980
force site_url to be lowercase when stored. Otherwise rating hubs on postgres could get real messy.
2015-02-15 23:45:22 -08:00
friendica
8774089005
preparatory work for site ratings
2015-02-15 21:22:05 -08:00
friendica
2e3daf77bb
site firehose
2015-02-15 20:20:23 -08:00
friendica
9067d4c157
taganyone wasn't working
2015-02-15 18:38:26 -08:00
friendica
0249fbb7e6
lost ability to delete events
2015-02-15 16:04:59 -08:00
friendica
7ad425bbda
failure to auto update comments if it's your own.
2015-02-14 21:57:47 -08:00
friendica
4b513d3322
issue #896
2015-02-12 19:22:07 -08:00
friendica
084ca3f4a1
typo
2015-02-12 18:49:42 -08:00
friendica
da2349bb6a
provide relief to sites that are severely impacted by the slow ITEM_UNSEEN searches. This does not incorporate any other flag optimisations as that will require a major DB update and possibly involve significant downtime. This is just to bite off a little chunk now and provide some much needed relief.
2015-02-12 17:45:25 -08:00
friendica
c62d605608
well that was certainly fun. And the reason why likes and other acitivity deletions weren't propagating. Hopefully this is the last reason and there aren't more lurking further down the chain.
2015-02-11 16:11:21 -08:00
friendica
79223b6b3d
item voting tools
2015-02-10 19:10:18 -08:00
friendica
79da33dafd
improvements in duplicate like detection, especially w/r/t event participation
2015-02-10 17:49:46 -08:00
friendica
268691ffb4
correct the object type if it isn't stored/linked to an item yet
2015-02-10 01:05:49 -08:00
friendica
81e7b47b76
more progress on event confirmations
2015-02-10 00:11:37 -08:00
friendica
fce51876c9
bring some styling back to the colorbox and improve the event preview ability
2015-02-09 18:58:43 -08:00
friendica
ed810a360f
event form - provide map ability for location field and add preview ability
2015-02-09 15:57:22 -08:00
friendica
0e74ebc6a9
title missing sending to diaspora (which doesn't support titles but let's not go there).
2015-02-09 15:12:15 -08:00
friendica
b31fe5c55d
help text for the "adjust for viewer timezone" toggle switch since you apparently need an IQ of 230 or greater to be able to use it correctly.
2015-02-08 23:37:34 -08:00
friendica
08b757a22c
Merge branch 'master' into tres
...
Conflicts:
mod/events.php
view/css/mod_events.css
2015-02-08 20:57:37 -08:00
friendica
b8add899a2
undo extra logging
2015-02-08 19:28:18 -08:00
friendica
7893b64955
make default calendar view ambivalent to the state of the ignore flag.
2015-02-08 15:14:45 -08:00
friendica
11dfeb652b
Merge https://github.com/friendica/red into pending_merge
2015-02-08 13:53:46 -08:00
friendica
9b1c09fe83
restrict "mark all events seen" to only the events that are presented in the notification view.
2015-02-08 13:52:46 -08:00
marijus
712bc643b5
revert to get_rel_link()
2015-02-06 11:34:23 +01:00
marijus
ed050e8ede
fix objurl until get_rel_link() gets sorted
2015-02-06 10:40:55 +01:00
friendica
e7a68eaef0
style the checkboxes in the event form
2015-02-05 21:01:02 -08: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
abcc70722c
event form cleanup backported from trinidad - still need to style the checkboxes
2015-02-05 19:37:55 -08:00
friendica
561bab4ece
remote rating and addition of rate-me to channel profile sidebar
2015-02-04 17:32:29 -08:00
friendica
1ceb0a7fba
hide channel address in directory from hovertip if not logged into the matrix
2015-02-03 23:36:37 -08:00
friendica
0357180164
remove extra debugging
2015-02-03 23:33:06 -08:00
friendica
127bf82187
probably enough for now - couldn't get the censorship filter in today, I think that's the only bit missing.
2015-02-03 23:30:07 -08:00
friendica
0cc29af6d0
order ratings friends first
2015-02-03 22:55:01 -08:00
friendica
4ead2cd79d
final cleanup on ratings feature
2015-02-03 21:19:29 -08:00
friendica
86771547e6
finish off the sync functions
2015-02-03 18:35:54 -08:00
friendica
17ffe122b3
ratings - mopping up, most everything but directory sync implemented
2015-02-03 18:10:55 -08:00
friendica
5cb2f55dbb
rating form work
2015-02-03 16:52:09 -08:00
friendica
c417a43338
styling for the directory page when it comes to ratings
2015-02-03 15:50:12 -08:00
friendica
36b756e4cd
honour block public setting - especially for standalones
2015-02-03 15:16:03 -08:00
friendica
df632c4232
run ratingsearch on the server
2015-02-03 15:06:16 -08:00
friendica
4362aa4c26
for now punt if have no poi, but we should get it from the server
2015-02-03 11:18:00 -08:00
friendica
6067274b51
start to tie ratings to the directory page
2015-02-02 23:58:44 -08:00
friendica
77379029f5
add ratings to the directory sync arrays
2015-02-02 21:07:46 -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
03bb236651
Merge branch 'master' into pocorate
2015-02-02 17:33:55 -08:00
friendica
fb6deb113b
improved directory registration - honour standalones and do the right thing
2015-02-02 17:32:54 -08:00
friendica
125ebfeb0c
add signatures
2015-02-02 16:54:55 -08:00
friendica
aafed50a0e
Merge branch 'master' into tres
2015-02-01 20:30:47 -08:00
friendica
e58bef049d
admin/dbsync not reporting failed updates
2015-02-01 15:41:01 -08:00
friendica
b1a92d620e
two tracks proceeding in parallel - first adding the ability to store a digital signature with ratings so that directories can pass them around, second provide some directory registration functions so we can obtain a list of directories from somewhere (to pass ratings around between them). This gives the primary directory role some value as that is where you register your directory.
2015-02-01 15:10:52 -08:00
friendica
e6a5f78003
Merge branch 'master' into tres
...
Conflicts:
include/zot.php
2015-01-31 00:50:20 -08:00
RedMatrix
b381579959
Merge pull request #881 from cvogeley/master
...
Add allowed and not allowed emails to the UI in the
2015-01-30 18:14:10 +11:00
friendica
4a243b63f7
cleanup event form and various required indicators on inputs
2015-01-29 20:09:48 -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
d7dae3c72a
Merge https://github.com/friendica/red into pending_merge
2015-01-29 15:19:16 -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
ff68ea6087
more message restrict conversions
2015-01-29 14:51:41 -08:00
Christian Vogeley
f81df92ef8
Add allowed and not allowed emails to the UI in the
...
admin menu
2015-01-29 20:27:35 +01:00
RedSwede
bee939d79a
fix issue 848 + code comments
2015-01-29 16:06:39 +01:00
friendica
fd0b6c967f
Merge branch 'master' into pocorate
2015-01-29 00:28:23 -08:00
friendica
c993ddd86e
prate module
2015-01-29 00:28:02 -08:00
friendica
b9a760783d
Merge https://github.com/friendica/red into pending_merge
2015-01-28 21:11:07 -08:00
friendica
e157371c39
remote_user => remote_channel
2015-01-28 20:58:59 -08:00
friendica
a496036066
local_user => local_channel
2015-01-28 20:56:04 -08:00
Habeas Codice
d59bd31a68
Merge branch 'master' of https://github.com/friendica/red
2015-01-28 17:40:39 -08:00
friendica
9b3b0b5e88
basic query for number of raters. Should probably be a join or subselect but that will take a bit more fiddling
2015-01-28 17:39:53 -08:00
Habeas Codice
64181abc6f
fix implicit boolean
2015-01-28 17:34:53 -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
marijus
87814670c1
no need for new line here - spacing is done via css
2015-01-28 08:56:56 +01:00
friendica
a2cdd1499c
Merge branch 'master' into tres
...
Conflicts:
include/socgraph.php
2015-01-27 20:00:43 -08:00
friendica
145b30adfc
allow RSS connections in the type 'a' autocomplete results as that is used for channel sources. Without it a feed cannot be selected as a channel source.
2015-01-27 18:34:18 -08:00
friendica
525c62ab1d
Merge https://github.com/friendica/red into pending_merge
2015-01-27 11:48:39 -08:00
friendica
f62383e648
allow doc/help system to use subdirs
2015-01-27 11:48:10 -08:00
marijus
65aa6cf708
move userReadableSize() and getIconFromType() from /include/RedDAV/RedBrowser.php to include/text.php and add template for mod/sharedwithme
2015-01-27 19:00:16 +01:00
friendica
efb6842d74
superblock enhancements
2015-01-26 20:47:53 -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
d73972e8e2
provide a json feed of search results
2015-01-26 17:09:33 -08:00
friendica
b428fdf66e
abstract poco into a single function in socgraph so we can provide different wrappers for it providing slightly different functionality.
2015-01-25 16:27:09 -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
anaqreon
1cbfe5adf1
misspelling
2015-01-25 15:49:07 -05:00
Habeas Codice
1d80bcf2e7
standardize sql
2015-01-24 21:16:43 -08:00
Habeas Codice
0405f2bcb9
Merge branch 'master' of https://github.com/friendica/red
2015-01-23 17:26:37 -08:00
Habeas Codice
891d231bbe
rand() fixes
2015-01-23 17:25:05 -08:00
marijus
0cbe64c360
some more kiss
2015-01-24 01:13:02 +01:00
marijus
8789c96e78
some code restructure
2015-01-23 14:50:39 +01:00
friendica
4c2a1e572a
start on item_restrict conversion
2015-01-22 21:04:54 -08:00
friendica
6e0e3b2433
more expanding item flags
2015-01-22 18:41:10 -08:00
friendica
e46eba1258
heavy lifting converting item flag bits
2015-01-22 17:41:16 -08:00
marijus
e874376268
this will require more fixing in include/enotify
2015-01-23 02:09:28 +01:00
marijus
87dcc4c145
possible performance improvement for sharedwithme update query
2015-01-22 22:50:38 +01:00
Habeas Codice
c05f0ec407
Merge branch 'master' of https://github.com/friendica/red
2015-01-21 21:27:07 -08:00
Habeas Codice
6d291d880e
directory server dba sql fixes
2015-01-21 21:25:50 -08:00
marijus
cad8228db3
Merge branch 'master' of https://github.com/friendica/red
2015-01-22 04:58:34 +01:00
marijus
3731ff97ff
make $links an array of links
2015-01-22 04:57:59 +01:00
friendica
b946ac63a1
couple of hubloc manager issues
2015-01-21 19:09:12 -08:00
friendica
0010eaa411
Merge https://github.com/friendica/red into pending_merge
2015-01-21 18:34:31 -08:00
friendica
8472e706bc
hubloc manage issue
2015-01-21 18:34:15 -08:00
marijus
4ff71fc0c7
change mod/sharedwithme backend to use activity object - this is not backwards compatible
2015-01-22 02:34:38 +01:00
friendica
29436081a8
slow progress removing bitfields on item table
2015-01-21 16:06:25 -08:00
friendica
51848c6190
working through the xchan table to remove bitfields, mostly complete except for updating the updater
2015-01-20 19:33:19 -08:00
friendica
ee3eee425c
that should take care of the bitfields in hubloc
2015-01-20 16:13:18 -08:00
friendica
6f11f20992
first cut at unpacking bitfields in hubloc, fixed hubloc_error and hubloc_deleted
2015-01-20 15:35:42 -08:00
RedMatrix
39dad87adc
Merge pull request #862 from pafcu/help
...
Add some database documentation + mod/help.php bugfix
2015-01-19 10:19:08 +11:00
marijus
b4faf4d90b
fix link
2015-01-18 15:31:13 +01:00
marijus
9ac0922ff2
fix goaway link
2015-01-18 15:29:05 +01:00
marijus
973398b915
fix profile tabs link
2015-01-18 15:15:48 +01:00
marijus
1c2d956d7f
basic proof of concept file activity support - will send activity via the filestorage module and via attach_delete()
2015-01-18 14:44:58 +01:00
Stefan Parviainen
319b279b3a
Don't try to open unexisting files in help
2015-01-18 10:26:05 +01:00
friendica
8f8700ddd2
mod_prep usability enhancements, doc updates
2015-01-16 00:53:04 -08:00
friendica
ec4d3a2349
fix to poco chatrooms
2015-01-15 20:56:55 -08:00
friendica
43254029ad
errors in mod_poco
2015-01-15 20:43:53 -08:00
friendica
dfe31dc3b7
more heavy lifting on poco rep
2015-01-15 19:05:42 -08:00
friendica
9c15844845
make sure mod/prep follows the poco_rating allow preference
2015-01-15 17:50:24 -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
56bc3bcdce
provide correct permissions role default for old-timers that didn't have any role configured.
2015-01-14 19:27:55 -08:00
friendica
168b67fa41
correct some activity object types (for comments), also fix a foreach warning resulting from recent tag work
2015-01-14 18:36:23 -08:00
friendica
7a24943c34
some back-end code to support location activity objects. Work in progress.
2015-01-14 14:46:01 -08:00
friendica
1005618faf
honor disable_discover_tab in mod/home - it isn't a tab here but basically block public content from showing if it's set.
2015-01-14 13:52:34 -08:00
friendica
a93f2b1b8f
now that's useful...
2015-01-13 18:41:11 -08:00
friendica
dfdef0af0d
provide a setting to control ALLOWCODE permissions at the channel level - it isn't always appropriate to apply this to all channels in an account.
2015-01-13 18:30:30 -08:00
friendica
98acefe228
revert recent 3.0 changes to mod/cloud so we can work on this completely in another branch and not destabilise core
2015-01-13 18:12:04 -08:00
friendica
111bbe65d9
Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretagging
...
Conflicts:
mod/profiles.php
2015-01-13 18:07:49 -08:00
friendica
e528483d81
hide friends broken, add parameter for item search by verb
2015-01-13 14:42:54 -08:00
Stefan Parviainen
47a2668b30
Allow tags in event description and location
2015-01-13 18:23:52 +01:00
Stefan Parviainen
93735df2c7
Allow tags in mail, many profile fields, and admin info
2015-01-13 17:54:40 +01:00
friendica
1b3e52af2d
theme toggle issue when viewing mod/cloud of another channel
2015-01-12 18:33:39 -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
cdc52ba884
change deletion behaviour of linked photo items. Previously deleting the visible item in the conversation deleted the photo as well. Now photos must be deleted in the photos module. Deleting the linked item removes any attached conversation elements (likes, etc.) and sets the conversation item to hidden. This may create an issue in the future if we move the photo tags, title, or other photo elements to the linked item rather than the photo. Noting here so this can potentially be discovered and remembered at that time.
2015-01-12 16:27:27 -08:00
friendica
9fc9af87e3
Merge https://github.com/friendica/red into pending_merge
2015-01-12 11:26:11 -08:00
friendica
962c6207ae
double perms msg
2015-01-12 11:25:48 -08:00
Stefan Parviainen
adc9564b5c
Refactor mention code to make it more reusable
2015-01-12 20:01:07 +01:00
friendica
580c30f516
another attempt to explain default permissions on connedit page
2015-01-11 21:18:29 -08:00
friendica
a088a8f03c
remove extraneous debug file left over from postgres work.
2015-01-11 20:02:24 -08:00
friendica
3f4f3e244a
that was not intended to be merged with master yet. Put it under a define
2015-01-11 15:22:58 -08:00
friendica
0259051a87
basic backend work for creating consensus items
2015-01-11 14:41:33 -08:00
friendica
b018b39e64
Merge branch 'master' into trinidad
2015-01-11 14:02:27 -08:00
Christian Vogeley
f0c7612bcd
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
doc/html/classRedmatrix_1_1Import_1_1Import-members.html
doc/html/classRedmatrix_1_1Import_1_1Import.js
2015-01-11 16:22:59 +01:00
Christian Vogeley
43f143a211
Fix for issue #763 Error creating new channel within the limits of the
...
subscription plan
2015-01-11 16:12:36 +01:00
friendica
4c31598555
Merge branch 'master' into trinidad
2015-01-10 14:59:24 -08:00
friendica
10102ac2ac
connection clone issues
2015-01-10 14:59:10 -08:00
friendica
df0f67843e
Merge branch 'master' into trinidad
2015-01-10 13:05:04 -08:00
Habeas Codice
0368fe49f3
Fix unescaped image data
2015-01-10 11:08:37 -08:00
marijus
978d78b953
basic changes for file activity
2015-01-09 15:18:45 +01:00
friendica
fab09ef1bc
Merge branch 'master' into trinidad
2015-01-08 16:03:30 -08:00
pafcu
80c77b7f92
Merge pull request #833 from pafcu/oneautocompleter
...
Fixes for the new autocompletion
2015-01-08 18:25:38 +02:00
Stefan Parviainen
32c6eab01c
Fix saved searches on network page, fix caching mith multiple autocompleters
2015-01-08 17:16:08 +01:00
Stefan Parviainen
833d51527b
Honor requested count in navbar search
2015-01-08 16:05:00 +01:00
friendica
0657195125
Merge branch 'master' into trinidad
2015-01-07 14:39:09 -08:00
friendica
087d6744fc
Merge https://github.com/friendica/red into pending_merge
2015-01-07 14:39:07 -08:00
friendica
ce953e2f41
syncing connections issue, incorrect return_url after deleting connection
2015-01-07 14:35:03 -08:00
Stefan Parviainen
f2e648308c
Return results from acl.php in standard form
2015-01-07 20:45:00 +01:00
Stefan Parviainen
34ecbcceea
Make nav search use textcomplete
2015-01-07 19:39:50 +01:00
friendica
3ef487418d
don't allow admin to delete the sys channel from the channel manage page
2015-01-06 20:12:34 -08:00
friendica
c05586fbe7
begin the grand unification for 3.0. Start by splitting DAV into a web accessible component and a DAV accessible component so that we can eliminate the http-auth prompts for web-accessed resources.
2015-01-06 11:55:42 -08:00
friendica
39459c2d65
undo these bits of trinidad - we're going to do things differently
2015-01-05 18:22:15 -08:00
friendica
aa18a43eff
Merge branch 'master' into trinidad
2015-01-04 14:54:37 -08:00
friendica
3983348b96
the last checkin removed hostname from the address for autocomplete searches. This one allows it if explicitly added with a '@'. So 'mike' will find all mikes. 'mike@z' will find mike@zothub but not mike@popcorn.
2015-01-04 14:51:41 -08:00
friendica
47526cdecf
Merge branch 'master' into trinidad
2015-01-04 14:48:14 -08:00
friendica
57d8271eba
only check the LHS of xchan_addr for autocomplete, don't match on the hostname.
2015-01-04 14:47:08 -08:00
friendica
82a37ebae3
Merge branch 'master' into trinidad
2015-01-04 12:30:51 -08:00
RedMatrix
ebb1a61684
Merge pull request #816 from pafcu/acl
...
Autocomplete improvements
2015-01-05 07:30:07 +11:00
Stefan Parviainen
cb181993a8
Fix wrong require
2015-01-04 14:54:52 +01:00
Stefan Parviainen
ac4c17dd4c
Typo
2015-01-04 14:31:27 +01:00
Stefan Parviainen
57809f20a4
Sorting of autocomplete
2015-01-04 14:23:23 +01:00
Stefan Parviainen
386f361855
Autocmplete suggestions for non-local users, also suggest from visited channel's connections
2015-01-04 12:54:23 +01:00
friendica
edd1ad37c4
Merge branch 'master' into trinidad
2015-01-04 00:48:18 -08:00
marijus
0779e3ae53
provide some info for buttons
2015-01-03 13:42:05 +01:00
friendica
1ef1d1c2b7
Merge branch 'master' into trinidad
2015-01-02 19:22:46 -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
friendica
3157304bbd
Merge branch 'master' into trinidad
2015-01-02 17:26:38 -08:00
pafcu
0e4a10c7ec
Merge pull request #810 from pafcu/aclsort
...
Sort acl results according to match position (only type='c' for now)
2015-01-02 13:19:18 +02:00
Stefan Parviainen
6b5f8bfbe4
Sort acl results according to match position (only type='c' for now)
2015-01-02 12:08:36 +01:00
friendica
8b844ed978
Merge branch 'master' into trinidad
2015-01-01 23:48:27 -08:00
friendica
c7aa8bf1b4
syntax issues (with some php versions?), unchecked intval
2015-01-01 23:47:14 -08:00
friendica
82d0a4af45
Merge branch 'master' into trinidad
2015-01-01 22:33:28 -08:00
friendica
68c612c597
fix shares that are processed with markdown (regression, this was pulled from diaspora2bb a couple weeks back as it was affecting diaspora input, but here we're dealing with red input only)
2015-01-01 22:30:54 -08:00
RedMatrix
817b54688e
Merge pull request #805 from pafcu/moretpl
...
Move some HTML out to templates
2015-01-02 12:10:50 +11:00
Stefan Parviainen
85e76773a0
Use grouped select field for role selection
2015-01-01 15:54:16 +01:00
Stefan Parviainen
686b6ee118
Use grouped select field for timezone selection
2015-01-01 14:44:50 +01:00
Stefan Parviainen
70f0019905
Checkboxify yesno-fields, but use CSS to show them as switches in Redbasic
2015-01-01 10:08:20 +01:00
friendica
abd345f80f
Merge branch 'master' into trinidad
2014-12-30 15:25:06 -08:00
RedMatrix
ae9d08267c
Merge pull request #797 from anaqreon/imagelink
...
Imagelink
2014-12-31 10:23:50 +11:00
RedMatrix
4a82967639
Merge pull request #791 from pafcu/notifications
...
Improved notifications
2014-12-31 10:21:38 +11:00
Andrew Manning
c49b521884
Added url tag around image for inserted links
2014-12-30 16:16:57 -06:00
pafcu
0623b47237
Merge pull request #793 from pafcu/filestorageurlfix
...
Encode URL offered in filestorage. Fixes #780
2014-12-30 22:40:53 +02:00
Stefan Parviainen
f6b16e1d5a
Encode URL offered in filestorage. Fixes #780
2014-12-30 18:11:45 +01:00
Stefan Parviainen
e6a3ea2c95
Make showing wall posts, intros and private messages under Notices optional
2014-12-30 15:27:33 +01:00
Stefan Parviainen
2710510392
Sort notifications
2014-12-30 15:21:29 +01:00
marijus
8e034a3b6b
fix recursive file permissions
2014-12-30 13:56:27 +01:00
friendica
2f650b74d3
Merge branch 'master' into trinidad
2014-12-29 23:58:14 -08:00
friendica
5cfe051139
initial trinidad checkin
2014-12-29 23:48:04 -08:00
RedMatrix
619733e297
Merge pull request #789 from pafcu/chanman
...
Don't show current channel separately in channel manager, highlight it i...
2014-12-30 08:57:37 +11:00
Stefan Parviainen
e69e59d260
Don't show current channel separately in channel manager, highlight it instead
2014-12-29 22:07:40 +01:00
friendica
3065650683
filter posts you author from unseen notifications - note there are other ways to do this, but involve some code complexity. This is easier to implement but may have a slight impact on the ping query performance. It's not horrid, just mentioning for the record.
2014-12-28 23:21:49 -08:00
RedMatrix
7b98a6fcb0
Merge pull request #772 from pafcu/chanman
...
Some work on the channel manager
2014-12-29 09:29:12 +11:00
RedMatrix
8d144396b1
Merge pull request #769 from pafcu/profiles
...
Redirect /profiles to default profile when multi_profiles is off. Fixes ...
2014-12-29 09:28:47 +11:00
friendica
50943f439c
issue #777 , make photo cache time configurable, read the comments.
2014-12-27 18:19:51 -08:00
Stefan Parviainen
40a327b68f
Allow quick access to mail and connections from Channel Manager
2014-12-27 14:06:09 +01:00