Commit Graph

3894 Commits

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