friendica
111bbe65d9
Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretagging
...
Conflicts:
mod/profiles.php
2015-01-13 18:07:49 -08:00
Stefan Parviainen
93735df2c7
Allow tags in mail, many profile fields, and admin info
2015-01-13 17:54:40 +01:00
friendica
2fc0d64139
uninitialised theme parent in mod/cloud
2015-01-12 19:29:43 -08:00
friendica
1b3e52af2d
theme toggle issue when viewing mod/cloud of another channel
2015-01-12 18:33:39 -08:00
friendica
66cef7531a
don't wipe out the item body of a linked item to a photo when doing a normal delete and not forced
2015-01-12 16:36:10 -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
Stefan Parviainen
adc9564b5c
Refactor mention code to make it more reusable
2015-01-12 20:01:07 +01:00
friendica
381f8a1b42
optionally use openssl encryption functions (higher performance over mcrypt, but potentially more likely to have been compromised)
2015-01-11 15:13:45 -08:00
friendica
6f7b1960af
allow the use of openssl crypto
2015-01-11 14:58:47 -08:00
friendica
0259051a87
basic backend work for creating consensus items
2015-01-11 14:41:33 -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
10102ac2ac
connection clone issues
2015-01-10 14:59:10 -08:00
marijus
978d78b953
basic changes for file activity
2015-01-09 15:18:45 +01:00
friendica
1b535ff8a5
clean up some url anomalies in dir_sort_links after security fix
2015-01-08 19:20:50 -08:00
friendica
af943f4569
double q argument could also cause issues
2015-01-08 19:13:13 -08:00
friendica
1e4e7ce2d3
SECURITY: dir_sort_links() exposes session cookie
2015-01-08 19:09:52 -08:00
friendica
aa490a39bb
include channel clones in PM deliveries (also some whitespace edits)
2015-01-08 16:02:15 -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
7176eb8845
Merge autocomplete caching, show more results in navbar search
2015-01-07 22:07:11 +01:00
Stefan Parviainen
34ecbcceea
Make nav search use textcomplete
2015-01-07 19:39:50 +01:00
friendica
fbe0610ce9
don't update locally deleted items
2015-01-06 15:44:23 -08:00
friendica
4b9ed48a54
don't let dns_get_record() "write to screen" if it errors.
2015-01-06 14:50:29 -08:00
friendica
1cfff44535
lines reversed in handle_tag()
2015-01-06 13:42:55 -08:00
friendica
b8d3936e47
Merge https://github.com/friendica/red into pending_merge
2015-01-06 11:26:53 -08:00
Stefan Parviainen
fac6963444
Add title to bb_observer tags to further clarify a bit what's going on
2015-01-06 14:00:31 +01:00
friendica
43f43d78cf
regression: need float clear on manage page so footer doesn't end up floated,
...
add default value to features so that features can be created that are default enabled, or modified later to default enabled without requiring a system config to accomplish this.
2015-01-05 20:57:30 -08:00
friendica
3185bfe3ca
detect https coming through reverse proxy or load balancer using x-forwarded-proto instead of (actually in addition to testing) $_SERVER['HTTPS'] and/or $_SERVER['SERVER_PORT'] to indicate ssl is enabled
2015-01-05 16:12:55 -08:00
Stefan Parviainen
128b0008ee
Replace jslider with jRange
2015-01-05 18:30:12 +01: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
7bf7f8180d
Revert "Revert "Language names via intl library.""
...
This reverts commit 4f35efa0ba
2014-12-31 10:42:08 +01:00
RedMatrix
4f35efa0ba
Revert "Language names via intl library."
2014-12-31 10:43:19 +11:00
RedMatrix
009b05b3b6
Merge pull request #796 from pafcu/profeditfix
...
Don't show links to edit alternate profiles if multi_profiles is disable...
2014-12-31 10:22:30 +11:00
RedMatrix
7b0b0dd76f
Merge pull request #794 from pafcu/lang
...
Language names via intl library.
2014-12-31 10:21:53 +11:00
RedMatrix
4a82967639
Merge pull request #791 from pafcu/notifications
...
Improved notifications
2014-12-31 10:21:38 +11:00
Stefan Parviainen
2444a3f9d9
Don't show links to edit alternate profiles if multi_profiles is disabled
2014-12-30 21:33:20 +01:00
marijus
4edc9a696b
design fixes for photos, files and random fixes
2014-12-30 21:04:48 +01:00
Stefan Parviainen
b54bbf0fb8
Update function doc, return language code if language is not recognized
2014-12-30 20:34:26 +01:00
Stefan Parviainen
9cab8ae58a
Language names via intl library. Fixes #773
2014-12-30 20:29:31 +01:00
Stefan Parviainen
e6a3ea2c95
Make showing wall posts, intros and private messages under Notices optional
2014-12-30 15:27:33 +01:00
marijus
8e034a3b6b
fix recursive file permissions
2014-12-30 13:56:27 +01:00
RedMatrix
b7d2b9c1ef
Merge pull request #778 from pafcu/loginredir
...
Redirect to login page on failed login. Fixes #628
2014-12-29 09:29:23 +11:00
pafcu
0b79445b57
Merge pull request #779 from pafcu/audio
...
Make spaces work in [audio] and [video]. Fixes #774
2014-12-28 12:30:20 +02:00
Stefan Parviainen
fffc7dffba
Fix typo
2014-12-28 11:28:54 +01:00
Stefan Parviainen
f08ee3bab9
Make spaces work in [audio] and [video]. Fixes #774
2014-12-28 11:22:58 +01:00
Stefan Parviainen
426ac22e12
Redirect to login page on failed login. Fixes #628
2014-12-28 09:26:30 +01:00
marijus
cafc1b64b0
some more mime-type -> icon for filebrowser
2014-12-27 14:28:02 +01:00
marijus
0cb0c2b1bf
more work on files
2014-12-27 10:10:56 +01:00
