Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 20:15:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
13322 commits 7 branches 30 tags 160 MiB
Commit graph

4066 commits

Author SHA1 Message Date
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
Stefan Parviainen
6a679d26ce Fix #771, add tooltips to mail and intros count in channel manager, always show counts (even when 0, makes it easier to understand what the icons are) 2014-12-27 13:36:05 +01:00
Stefan Parviainen
754fec9a54 Redirect /profiles to default profile when multi_profiles is off. Fixes #768 2014-12-27 12:46:59 +01:00
friendica
82d3c2a7e0 Merge https://github.com/friendica/red into pending_merge 2014-12-26 15:45:50 -08:00
Thomas Willingham
0130fb077f Cruft left over from stuff we don't have anymore. 2014-12-26 16:59:52 +00:00
friendica
7ba92feabf doc update 2014-12-26 00:13:22 -08:00
Thomas Willingham
5fd26eceb4 Pass sitename to apps 2014-12-22 15:39:04 +00:00
friendica
d3830aea96 provide last successful poll run time (using relative time) in siteinfo so that we can tell folks that have no idea what we're talking about that their poller definitely isn't running and this is probably why nothing works correctly. 2014-12-21 18:40:25 -08:00
friendica
b840c27995 Merge https://github.com/friendica/red into pending_merge 2014-12-21 14:45:46 -08:00
friendica
2b3cc585a2 fix double encoding of homepage in profile activity - not as straight-forward as it looked 2014-12-21 14:43:06 -08:00
marijus
27d786c979 files: make mod/filestorage.php load via ajax and some design work. work in progress... 2014-12-21 20:11:30 +01:00
Stefan Parviainen
fe80dbb3a7 Access list of smilies over JSON 2014-12-20 17:33:35 +01:00
friendica
6d8214f96b provide link to help for channel permission roles when creating a channel 2014-12-19 01:48:47 -08:00
friendica
9c445e9817 incorrect check for sys ownership 2014-12-19 00:28:36 -08:00
friendica
ab2d11b37e mod/import: try ten times to create a unique webbie if the chosen one is in use. 2014-12-18 19:48:23 -08:00
friendica
2fcbb9c4b3 fix some directory anomolies 2014-12-16 18:33:16 -08:00
friendica
07e747ed0e add divmore to directory entries 2014-12-16 17:29:16 -08:00
friendica
4d5f28f07a Merge https://github.com/friendica/red into pending_merge 2014-12-16 14:29:38 -08:00
friendica
5b49211035 edit and preview removed from additional features and turned into core functionality (always enabled). 2014-12-16 14:28:07 -08:00
Thomas Willingham
d82c7c2067 Minor doco 2014-12-16 18:13:04 +00:00
friendica
17e27d0d87 add Thomas's Diaspora repair script as include/fixd.php - altered so it can be re-run if necessary with a count of remaining hublocs to be fixed. Some sites are down so it probably can't ever get to zero. The check for a null join is quite an expensive query. It could block your DB for a couple minutes while it runs. 
Also some preliminary work on a means to take the channel module out of list/forum mode if a specific mid is requested.
 2014-12-16 00:25:41 -08:00
friendica
2e990743e7 Merge https://github.com/friendica/red into pending_merge 2014-12-15 14:37:57 -08:00
friendica
f28103d595 wall tags 2014-12-15 14:37:31 -08:00
Thomas Willingham
c6d0695edf Issue #743 2014-12-15 19:32:28 +00:00
Thomas Willingham
5fac8e80de Issue #739 2014-12-13 15:00:00 +00:00
Thomas Willingham
c91aa863d8 Missing '' 2014-12-10 21:56:44 +00:00
Thomas Willingham
81fdb1cdfc Bring back 'no special theme for mobile' 2014-12-10 21:41:59 +00:00
Stefan Parviainen
97d1072f9b Make it clear that title and categories are optional 2014-12-08 16:49:48 +01:00
Thomas Willingham
81f3b20610 Merge pull request #726 from pafcu/tagsinotherchannels 
Show tags in other channels profile field to make it easier to navigate ...
 2014-12-08 13:43:06 +00:00
Thomas Willingham
934172c2fc Merge pull request #724 from pafcu/suggestionsindir 
Show suggestions in directory
 2014-12-08 13:34:56 +00:00
Thomas Willingham
99b5bef68e Merge pull request #723 from pafcu/diropts 
Directory sorting as a dropdown, forum filter as checkbox, option to sor...
 2014-12-08 13:31:34 +00:00
Stefan Parviainen
62dabecf97 Show tags in other channels profile field to make it easier to navigate to the channels 2014-12-07 16:19:22 +01:00
Stefan Parviainen
c8818d8349 Suggestions in dir redux. Suggestions are now showed in directory if suggest=1 parameter is given to directory. 2014-12-07 13:40:21 +01:00
Stefan Parviainen
83ea120ac9 Revert "Revert "Directory shows channel suggestions by default"" 
This reverts commit bfde28f28e.
 2014-12-07 13:40:21 +01:00
Stefan Parviainen
647311db3e Directory sorting as a dropdown, forum filter as checkbox, option to sort oldest first 2014-12-07 12:31:12 +01: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
Thomas Willingham
2aaa33c135 The other half of 'any theme for any device'. Closes #71 2014-11-30 18:57:58 +00:00
Thomas Willingham
d67c5a6ffd Handle included txt files (ie, install doco) as BBCode, otherwise it strips all 
white space.  Was going to use Markdown, but lots of not-markdown gets parsed
then, so...
 2014-11-30 00:36:30 +00:00
Habeas Codice
d3ffdbf2a4 Merge remote-tracking branch 'upstream/master' 2014-11-26 11:02:30 -08:00
Habeas Codice
1a57f3ed51 fix true toggle 2014-11-26 11:01:18 -08:00
friendica
ddc8557b69 hide online presence maps to DNT 2014-11-24 15:36:11 -08:00
friendica
756abd6678 add event export (this month) to event UI 2014-11-24 02:50:14 -08:00
friendica
79e5c2456b add link to search forums in the directory 2014-11-23 18:54:33 -08:00
friendica
5bb794cc28 allow directory searches to be filtered by (public forums) and/or (! public forums) 2014-11-23 18:22:19 -08:00
friendica
38aa8204cc Merge https://github.com/friendica/red into pending_merge 2014-11-23 14:51:20 -08:00
friendica
d191e7c348 project roadmap 2014-11-23 14:51:04 -08:00
Habeas Codice
8ac3b938fd added dbdriver to siteinfo json to better track affected sites 2014-11-22 13:27:52 -08:00
Habeas Codice
cf739c0361 Merge remote-tracking branch 'upstream/master' 2014-11-21 15:39:14 -08:00
Habeas Codice
db29dc6bff implicit type conversion 2014-11-21 15:33:21 -08:00
friendica
e74a3926fe yet another option for the homepage 2014-11-20 17:38:41 -08:00
Habeas Codice
c8af19c69c Merge remote-tracking branch 'upstream/master' 2014-11-19 21:11:11 -08:00
Habeas Codice
92d0a9404f Should fix issue #704 
submitter please verify and close
 2014-11-19 21:10:19 -08:00
friendica
50244f943d minor photo flag issue - and some more whitespace edits 2014-11-19 16:29:35 -08:00
friendica
3224848bad turn the "adult photo flagging" (which prevents a particularly flagged photo from showing up in your top level albums) into a feature so it doesn't clutter the normal photo edit form. This feature was a quick hack and needs more work; but it could be important to somebody. 2014-11-18 19:02:28 -08:00
friendica
11f0b45a90 blog mode - turn the comment link into a button and group with the likes/dislikes 2014-11-18 16:58:36 -08:00
friendica
38d50cabd4 private mail buttons 2014-11-18 15:13:37 -08:00
RedMatrix
bfde28f28e Revert "Directory shows channel suggestions by default" 2014-11-19 09:15:24 +11:00
RedMatrix
3917880673 Merge pull request #702 from pafcu/master 
Directory shows channel suggestions by default
 2014-11-19 09:06:36 +11:00
RedMatrix
fd10b49fbf Merge pull request #699 from pafcu/master 
Fix dirsearch with quoted single-word term
 2014-11-19 08:55:06 +11:00
Stefan Parviainen
e0ab1e24e4 Directory shows channel suggestions by default 2014-11-18 19:42:13 +01:00
Stefan Parviainen
c8c061d0cf Fix dirsearch with quoted single-word term 2014-11-18 13:48:22 +01:00
friendica
db3015e34e allow members to set the per-item "show more" height (separately for network and matrix, display and search are system pages and therefore set at 400) 2014-11-17 23:48:03 -08:00
friendica
7e8f3e4dfb requote ignore 2014-11-17 18:46:57 -08:00
RedMatrix
913dafc593 Merge pull request #698 from habeascodice/master 
some sql fixes
 2014-11-18 13:00:26 +11:00
Habeas Codice
e61dbf722d implicit type conversion 2014-11-17 16:49:17 -08:00
Habeas Codice
d0e0a8fb27 implicit type conversion 2014-11-17 16:37:47 -08:00
Habeas Codice
4fa0df2927 another one 2014-11-17 16:01:17 -08:00
friendica
65a6121014 fix the update_unseen stuff on the channel page also 2014-11-17 15:43:03 -08:00
friendica
064b48fa71 Merge https://github.com/friendica/red into pending_merge 2014-11-17 15:27:18 -08:00
friendica
13a7637d9d whitespace 2014-11-17 15:26:32 -08:00
friendica
c0ad4763b3 add unseen count and way to mark unseen to list mode. Also fix automatic mark of unseen so as to work with list mode. 2014-11-17 15:18:06 -08:00
Habeas Codice
96427a23a3 Merge branch 'master' of https://github.com/habeascodice/red 2014-11-17 15:15:02 -08:00
Habeas Codice
bcaa32a83a fix boolean 2014-11-17 15:13:49 -08:00
RedMatrix
e59f7cc198 Merge pull request #697 from pafcu/master 
Fix dirsearch parser to not get confused by logic terms in values and to ...
 2014-11-18 08:49:54 +11:00
RedMatrix
5aba2e82df Merge pull request #695 from pafcu/master 
Switch to a better datetime picker widget
 2014-11-18 08:33:04 +11:00
Stefan Parviainen
ece9819b4d Fix dirsearch parser to not get confused by logic terms in names and to handle quoted single word names 2014-11-17 18:51:37 +01:00
friendica
b11ed7f88e allow somebody to access the "home page content" (whatever that may be) even after logging in by including a home/splash argument. It appears that nothing else is required to provide 'sys' channel webpage contents except a link in the admin page to create them. There *may* be an issue with comanche theme selection but we'll cross that bridge when we come to it. Also thinking that we might want to map /home/foo to /page/sys/foo in the longer term scheme of things. 2014-11-16 22:46:52 -08:00
friendica
591f10e235 module cleanup 2014-11-16 19:08:10 -08:00
friendica
18cedf4def blog/list mode display settings 2014-11-16 16:48:35 -08:00
friendica
cbaee76dd9 "list mode" (forum and blog mode, no comments or comment boxes displayed on the summary page) 2014-11-16 16:19:24 -08:00
Stefan Parviainen
c1b8608940 Switch to a better datetime picker widget 2014-11-16 13:56:45 +01:00
friendica
7e58bfe931 Merge https://github.com/friendica/red into pending_merge 2014-11-15 14:04:20 -08:00
friendica
f299922df3 minor changes to support forum mode 2014-11-15 14:03:41 -08:00
marijus
8b1e83128a fix lost $sql_extra in recent sql query changes 2014-11-15 14:39:36 +01:00
RedMatrix
71237860c9 Merge pull request #691 from dawnbreak/master 
Changed two strange looking places in boot.php.
 2014-11-14 12:22:25 +11:00
Klaus Weidenbach
e8b77fbdff Fixed a variable conflict in mod/xchan.php. 
A variable $rr inside the foreachs was used twice.
Add translation to mod/xchan.php.
 2014-11-14 00:45:25 +01:00
Habeas Codice
a2d9dd1882 violates new sql standards 
missed during merge
 2014-11-13 13:58:04 -08: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
a2cf1900c8 this should make all the 'sys' webpage design tools useable by the admin 2014-11-12 18:04:00 -08:00
friendica
f42a16ca04 Merge https://github.com/friendica/red into pending_merge 2014-11-12 15:32:15 -08:00
friendica
498344e81f sys edit ability to menus and menu items 2014-11-12 01:43:34 -08:00
marijus
1ed144b83c make search and advanced search use the same input form 2014-11-12 10:27:13 +01:00
friendica
ada2e43ea2 extend sys support to layouts 2014-11-12 00:48:09 -08:00
friendica
9be4fcce55 uid not set in webpages.php, start on editwebpage.php 2014-11-11 22:55:24 -08:00
friendica
4b9ec6645b cleanup 2014-11-11 20:44:43 -08:00
friendica
b5af667985 slow progress on sys publishing, making sure all the data we need is in the places we need it but validate it anyway 2014-11-11 19:29:30 -08:00
friendica
37742be6af some more work on sys publishing 2014-11-11 18:57:59 -08:00
friendica
570577a990 a couple of places where we need to look for a sys channel euid. 2014-11-11 18:05:50 -08:00
friendica
f2d5f23d58 Nothing here, move along. 2014-11-11 15:50:27 -08:00
friendica
3fa003b5a8 add some subtle delineation to directory entries, remove forced link on homepage element (SECURITY) 2014-11-11 15:13:18 -08:00
friendica
325b269b22 the code is a bit crufty, but this should fix issue #687 2014-11-11 01:05:29 -08:00
friendica
0a84b45793 Merge https://github.com/friendica/red into pending_merge 2014-11-10 19:22:23 -08:00
friendica
d432f4ccd5 issue #683 - don't linkify homepage field without validating 2014-11-10 19:20:23 -08:00
RedMatrix
ecdfa0b96d Merge pull request #686 from beardy-unixer/master 
Add a new theme flag - library.  Not directly available to be used itsel...
 2014-11-11 13:40:03 +11:00
friendica
5619902776 indicate public forums in directory results (there will be some [possibly considerable] lag time before existing forums are correctly tagged). 2014-11-10 17:44:02 -08:00
friendica
6209465233 add public forum identification to libzot. No attempt is made to identify other types of forums or weird custom channel permissions. If the channel is auto-accept and taggable, it's a public forum. 2014-11-10 15:21:04 -08:00
friendica
0b4575a40b class is a reserved word 2014-11-10 14:23:06 -08:00
Thomas Willingham
9ddf49c661 Add a new theme flag - library. Not directly available to be used itself but 
installed as a lib for other themes.  Like SDL, or GTK.

Get rid of mobility - it's better done with Comanche and schemas.

Describe themes instead of restricting them.  Mobile themes can be used as
the desktop theme and vice-versa.  This deals with the problem of "but my
device is something inbetween".

Presently not exposed to members.
 2014-11-10 19:34:39 +00:00
friendica
2e695d1da2 menu page cleanup 2014-11-09 17:39:54 -08:00
friendica
d5d1f655d9 remove extraneous logging 2014-11-09 16:11:56 -08:00
friendica
50b9cc6f39 directory listing shows phantom keywords 2014-11-09 16:11:03 -08:00
Stefan Parviainen
28f3d7be5a New layout for directory 2014-11-09 00:18:26 +01:00
friendica
b6ae56b069 Merge https://github.com/friendica/red into pending_merge 2014-11-07 05:16:14 -08:00
friendica
1cc1bc8e81 fix broken photo edits when adult flag is changed 2014-11-07 05:15:39 -08:00
marijus
2cfe0f1545 provide lockstate for photo edit 2014-11-07 12:13:38 +01:00
friendica
1fbd1a79c7 Provide a way to mark photos as adult and hide them from the default album view. Still need a button or setting to enable "unsafe viewing". This has no effect anywhere but in the album views. They can still be viewed by flipping through the individual photos with 'prev' and 'next'. We probably need a comprehensive strategy for how to deal with n-s-f-w photos in albums so consider this a band-aid which requires additional work and integration with other facilities which access these photos. It is entirely optional. 2014-11-06 17:27:28 -08:00
marijus
5e7e8d1089 provide a lockstate for photo uploads 2014-11-06 11:57:33 +01:00
friendica
038e7c8923 crude skeleton for location manager and the UI sucks but at least it's on a webpage and you don't have to do it by hand. 2014-11-05 18:39:10 -08:00
friendica
3b22e2f5f5 some minor cleanup of unreported (and as yet undiscovered) issues with 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. 2014-11-05 16:21:03 -08:00
friendica
74b3e0a7eb changed notification description 2014-11-04 18:29:17 -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
ba7f1bb8ee configurable visual alerts/notifications 2014-11-04 15:24:24 -08:00
friendica
a80e696b77 wall posted comment to a top-level wall post which arrived via a route (e.g. was posted to a forum) had no route, hence downstream recipients report route mismatch 2014-11-03 17:35:42 -08:00
marijus
287d5e0f10 if uploading a photo go away to album 2014-11-03 11:19:27 +01:00
marijus
2f85d12a6c if deleting a photo go away to album 2014-11-03 10:46:57 +01:00
marijus
dc5e05d334 even more photos work 2014-11-01 23:55:36 +01:00
friendica
50c16c394f check that we have valid data 2014-11-01 01:52:27 -07:00
marijus
5d151b9886 do not reload page for photo upload 2014-10-31 20:25:43 +01:00
marijus
2982212797 more work on photo upload 2014-10-31 14:33:41 +01:00
friendica
4e454656fe Merge https://github.com/friendica/red into pending_merge 2014-10-30 19:29:28 -07:00
friendica
28a35261db What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect. 2014-10-30 19:15:03 -07:00
marijus
0ff4d9015b some work on photo upload 2014-10-30 14:10:55 +01:00
friendica
cfbfdca610 allow feed paging 2014-10-29 17:55:15 -07:00
friendica
7d9f785758 if any privacy tags are created on a top level post, restrict the post; since it could have been quite sensitive. If there were errors processing the actual tag restrict the post to the profile owner. Also make the "privacy tag over-rides ACL" behaviour configurable. Default is that privacy tags over-ride the ACL. 2014-10-28 20:01:44 -07:00
friendica
653305889c Merge https://github.com/friendica/red into pending_merge 2014-10-28 04:18:35 -07:00
friendica
36110831cb change photo tag bubble tip 2014-10-28 04:18:08 -07:00
marijus
ec8bab7784 change the way tagrm works to allow tag removal on the fly 2014-10-28 11:56:00 +01:00
friendica
9cc76cb33d several unrelated things - auto_follow wasn't working for new accounts, 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. 2014-10-27 19:23:40 -07:00
friendica
1b53d1c1d3 Merge https://github.com/friendica/red into pending_merge 2014-10-27 16:20:59 -07: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
marijus
d192bcad65 do not reload page for edit album and some minor cleanup 2014-10-27 21:31:54 +01:00
friendica
95de759766 a couple of photo tag issues 2014-10-26 21:37:59 -07:00
friendica
d4d44b7a87 couple of other places where we need to reset stuff completely if the role changes 2014-10-26 19:47:55 -07:00
friendica
812135bfab reset ACL just in case it was custom already. 2014-10-26 19:41:53 -07:00
friendica
655c3e1b47 put privacy role selector in settings page. Change visibility of various permissions items accordingly. 2014-10-26 19:32:12 -07:00
friendica
d2af45d206 use intval rather than dbesc since these are ints. Should work regardless, but this makes it consistent with the way we do most other queries. 2014-10-26 15:49:00 -07:00
friendica
864fcd1da6 Merge https://github.com/friendica/red into pending_merge 
Conflicts:
	mod/like.php
 2014-10-26 15:36:16 -07:00
friendica
5abd01f072 allow photos without comments to be liked 2014-10-26 15:34:18 -07:00
marijus
6497e78956 some work on photos like/dislike 2014-10-25 15:23:20 +02:00
zottel
5b04b9480e make bbcode/html includes work in markdown help pages and vice versa 2014-10-24 21:17:56 +02:00
Thomas Willingham
38801f802f Issue #661 2014-10-24 17:46:31 +01:00
friendica
1a9b8d4f0c don't offer forum (@name+) completion in comments, since it won't do anything. 2014-10-23 22:00:16 -07:00
friendica
58c692e389 improved wall-to-wall detection for comments so we can handle Diaspora signing and wall-to-wall attribution correctly. 
Do it at the point of submission. This also fixes a potential bug in yesterday's wall-to-wall permission setting,
if it was a local comment to a remote post.
 2014-10-22 20:39:49 -07:00
RedMatrix
3fb0354a55 Merge pull request #655 from pafcu/master 
Better handling of incorrect info entered in event
 2014-10-22 12:02:22 +11:00
friendica
ed7712cfbf private forum issues 2014-10-21 16:33:35 -07:00
Stefan Parviainen
c8666b9076 If entered event info is not valid, let user try again with the old info still there. Closes friendica/red#648 2014-10-21 18:28:47 +02:00
friendica
bac947c4dd wrong template loaded issue 2014-10-20 20:10:23 -07:00
friendica
3d47285414 Merge https://github.com/friendica/red into pending_merge 2014-10-20 16:50:02 -07:00
friendica
cb15c73dae move all theme initialisation to one place - just after calling module_init. Revert if there are serious issues, but please note the issues in as much detail as possible so we can work through them. 2014-10-20 16:47:58 -07:00
marijus
11e8fe3085 more work on photos 2014-10-20 15:05:33 +02:00
friendica
bae3029c63 merge madness 2014-10-19 16:12:05 -07:00
friendica
ae9e1fa688 missing event permissions 2014-10-15 18:35:56 -07:00
marijus
997ec0911c $comments > $commentbox 2014-10-15 22:41:42 +02:00
marijus
04a254d94a some work on single photo view comments 2014-10-15 22:23:38 +02:00
marijus
dc23030dcb one more item_id > id 2014-10-15 21:17:07 +02:00
marijus
0c2d9edd83 it seems we do not have an key called item_id here so must be id only 2014-10-15 21:15:20 +02:00
friendica
aa0aa22b8a chanman is now 'locs' and a couple of post handlers have been defined. 2014-10-14 20:33:38 -07:00
friendica
79684e05cc fix import sql error 2014-10-13 21:24:06 -07:00
Klaus Weidenbach
bc2ad74813 When you delete something in /cloud stay in the right folder. 
When you deleted a file in /cloud you was always jumped back to /cloud/[channel],
now you will stay in the parent folder.
Some more doxygen documentation.
Removed duplicate data from logging output and reduced logging in RedDAV in general.
 2014-10-14 00:15:41 +02:00
Klaus
5aae5862f2 A fix, but I have no case to verify. 
I could not find out under which conditions this is relevant and therefore have no test case, but it must be of instance RedDAV\RedFile.
 2014-10-12 21:10:04 +02:00
Klaus Weidenbach
dc4593f5b5 Moved classes from reddav.php into own files. 
Finished moving classes out from include/reddav.php into own files. Also
continued with namespace for RedDAV.
Improved some docs and added some todos and fixmes.
 2014-10-12 00:33:37 +02:00
Thomas Willingham
82232c6916 Show tag in siteinfo. Not useful for us, quite useful for admins. 2014-10-11 17:24:58 +01:00
Thomas Willingham
b84b2d5aa5 FFS, another oops 2014-10-11 16:19:36 +01:00
Thomas Willingham
d46fd7917f Fix webpages. Sycning between too many codebases... 2014-10-11 16:18:15 +01:00
Thomas Willingham
d132646915 Unbreak webpages 2014-10-11 15:42:31 +01:00
friendica
3d0d36b2bc fix diaspora reshare tags 2014-10-10 19:14:37 -07:00
marijus
4e9bd8b8f0 This is a fix to not interfere the ongoing adding of .generic-content-wrapper with the ongoing styling of redbasic theme. 
adding of .generic-content-wrapper is needed and useful for derivative themes but it should not contain any styling information for redbasic theme. therefor i added .generic-content-wrapper-styled as a quickfix for spots where redbasic is not finished yet.
Sidenote: please avoid opening a div in one *.tpl and close it in another or (even worse) open a div in a *.tpl and close it in an already templatified mod/*.php. This will really make the code and templates very, very confusing.
 2014-10-10 15:52:56 +02:00
Jeroen
e06c3e5a91 Added and changed on some places div class generic-content-wrapper. And added to redbasic. Other thems can now also theme backgrounds of a lot of pages. I'm not completely done, but till now - this is it. 2014-10-09 14:54:04 +00:00
friendica
9ac12d6f32 oembed issues 2014-10-08 20:37:46 -07:00
friendica
ddcc0ad567 dav issue 2014-10-08 16:47:30 -07:00
friendica
15a17280d9 Merge https://github.com/friendica/red into pending_merge 2014-10-08 15:59:04 -07:00
friendica
bca4d540e0 disable email notifications when bulk importing content. 2014-10-08 15:15:20 -07:00
tuscanhobbit
9edaa2843b it's probably better to return an int type in json 2014-10-08 19:03:07 +02:00
tuscanhobbit
c7c76cf221 The simplest way to hide hubs in statistics 2014-10-08 18:56:42 +02:00
RedMatrix
ae915df0a5 Merge pull request #620 from dawnbreak/RedDAV 
Moved RedBrowser class from reddav.php to it's own file.
 2014-10-07 15:17:19 +11:00
friendica
bbf88cf639 found one bug trying to fetch the recursive reshare from hell. I still think there's a problem with attribution but we'll have to wait and find that once we have some content to track. Also in private messages, on the message list page, change the text from delete message to delete conversation, because that's what we're really doing. 2014-10-06 20:54:52 -07:00
friendica
03bbbdaf10 shareable design elements 2014-10-06 17:47:17 -07:00
Klaus Weidenbach
33394f58ff Moved RedBrowser class from reddav.php to it's own file. 
First step on cleaning up ReadDAV classes and restructuring it bit in
preparation for adding some more DAV features, photo access, CalDAV, etc.
and hopefully also some PHPunits.
Add a PHP5.3 namespace for RedDAV classes. Any objections against this or
the vendor namespace?
Add some more documentation for RedBrowser.
 2014-10-06 23:38:33 +02:00
friendica
4d049741ef try and guess mimetype for openid profile photo 2014-10-05 17:17:25 -07:00
RedMatrix
7bad7e505a Merge pull request #616 from dawnbreak/docu 
Documentation and some restructure in RedBasicAuth
 2014-10-06 09:02:21 +11:00
Jeroen
a17eae941b image/jpeg > image/png 2014-10-05 21:38:47 +00:00
Klaus Weidenbach
305498eb16 Some documentation for include/reddav.php and a bit code cleanup. 
Removed some duplicate code in RedBasicAuth and restructured a bit.
Still work in progress.
 2014-10-05 15:24:16 +02:00
friendica
191ef124cf add 'nopush' option to the post API so somebody could bulk load a bunch of existing content via the API without invoking the notifier and sending each out as a fresh post. 2014-10-05 01:09:57 -07:00
friendica
f618e02117 Merge https://github.com/friendica/red into pending_merge 2014-10-03 16:52:01 -07:00
friendica
ec604a4158 more infrastructure for sharing page design elements 2014-10-03 16:51:22 -07:00
marijus
55b75381ad it seems this is needed also to not allow editing profile photo album 2014-10-03 19:15:37 +02:00
friendica
328d72971d Merge https://github.com/friendica/red into pending_merge 2014-10-03 03:35:50 -07:00
friendica
2bd4b36238 rev update 2014-10-03 03:35:01 -07:00
friendica
f5623ae11d doc updates 2014-10-03 03:34:50 -07:00
RedMatrix
dfd39ebb3c Merge pull request #611 from tuscanhobbit/dev 
site language in siteinfo/json has been re-added
 2014-10-03 18:51:16 +10:00
marijus
df70c2c9b6 more work on photos 2014-10-02 21:04:50 +02:00
Paolo Tacconi
9495aba499 site language in siteinfo/json has been re-added 2014-10-02 16:25:34 +02:00
RedMatrix
a932c20dc4 Merge pull request #610 from tuscanhobbit/dev 
site language wasn't included in siteinfo/json
 2014-10-02 23:05:59 +10:00
Paolo Tacconi
15c1529e83 query for statistics are now executed by poller 2014-10-02 13:43:48 +02:00
friendica
16b94f1dc0 issues with diaspora comment signatures on relayed comments that are relayed through a redmatrix site (parent post is redmatrix) and involve a private post. 2014-10-02 02:43:07 -07:00
tuscanhobbit
b39cd90e07 site language was left out of siteinfo 2014-10-01 20:11:11 +02:00
Paolo Tacconi
bfeac36702 useless file: knownhubs 2014-09-30 13:32:08 +02:00
Paolo Tacconi
1cc5babd39 added directory status to siteinfo 2014-09-30 13:30:04 +02:00
Paolo Tacconi
018f1b813c Added mod returning a list of known hubs, for a lightweight hub crawler 2014-09-30 12:24:49 +02:00
Paolo Tacconi
d09003dcff Numbers shouldn't be strings 2014-09-29 10:05:31 +02:00
habeascodice
c07643e407 Allows extra content to be inserted at end of profile_photo page. Needed for openclipatar addon. 2014-09-28 19:33:37 -07:00
marijus
e18dfbe3ce Merge branch 'master' of https://github.com/friendica/red 2014-09-28 23:15:24 +02:00
marijus
97c6ba77c7 some more work on photos 2014-09-28 23:14:49 +02:00
RedMatrix
114394c6ca Merge pull request #604 from tuscanhobbit/dev 
Statistics copied into siteinfo/json
 2014-09-29 06:25:08 +10:00
tuscanhobbit
9dee1779cf added statistics to siteinfo json 2014-09-28 19:31:04 +02:00
friendica
913109796e provide backup copy of post for diaspora reshare and re-fetch 2014-09-27 05:10:09 -07:00
marijus
b948ab5955 some more work on photos - work in progress 2014-09-26 12:29:07 +02:00
friendica
d8c03526ed optionally include wall items (posts) in import/export 2014-09-25 20:21:23 -07:00
friendica
e8854bb19d better way to deal with effective_uid 2014-09-22 22:03:19 -07:00
friendica
fb05919d90 make discover items interactive 2014-09-22 21:37:19 -07:00
Christian Vogeley
89fec0e085 Allow ordering by created 2014-09-20 23:28:42 +02:00
marijus
9feb619bea update jg to latest preview release and try once more to really justify the whole gallery 2014-09-20 15:40:40 +02:00
friendica
87a6f25769 try to sort out walltowall translation for diaspora recipients 2014-09-19 02:22:24 -07:00
friendica
c824e426e2 Merge https://github.com/friendica/red into pending_merge 2014-09-18 16:33:31 -07:00
friendica
d4759a5883 repeated content collapse on update from display page under rare conditions (when the conversation hasn't changed) 2014-09-18 16:32:05 -07:00
Thomas Willingham
5c8f5e2aa3 Catch the settings too 2014-09-18 18:14:52 +01:00
friendica
0b47fb9a91 keep the language consistent 2014-09-17 22:59:56 -07:00
friendica
51d9f0d97a channel permission roles 2014-09-17 21:16:15 -07:00
friendica
02fa970569 make the output a bit more readable 2014-09-17 19:14:23 -07:00
friendica
618b93d42e let the xchan diagnostic accept a webbie 2014-09-17 19:08:15 -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
6a82ccecd0 when importing channels - use the new location notification message to tell your original site where it sits in terms of primary. 2014-09-16 05:14:06 -07:00
friendica
b2f2424b52 push individual block to directory 2014-09-15 23:11:08 -07:00