harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,458 Commits 6 Branches 36 Tags
ff01505b369484e89187e796080bad68c8beb8a0
Commit Graph

3796 Commits

Author SHA1 Message Date
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
10102ac2ac connection clone issues 2015-01-10 14:59:10 -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
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
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
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
57d8271eba only check the LHS of xchan_addr for autocomplete, don't match on the hostname. 2015-01-04 14:47:08 -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
marijus
0779e3ae53 provide some info for buttons 2015-01-03 13:42:05 +01: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
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
c7aa8bf1b4 syntax issues (with some php versions?), unchecked intval 2015-01-01 23:47:14 -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
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
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