harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,513 Commits 6 Branches 36 Tags
2f9fe0280ecb2dcf2bb5b5fe9eed6a6651856647
Commit Graph
3823 Commits
Author SHA1 Message Date
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