Commit graph

3840 commits

Author SHA1 Message Date
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