a22ba7629b
update to German strings
2014-11-07 22:19:17 +01:00
55f64c3736
tgroup_check - decrypt if obscured before checking body text for reshares
2014-11-07 13:06:56 -08:00
961049f5fa
revert that bit
2014-11-07 12:16:13 -08:00
b6ae56b069
Merge https://github.com/friendica/red into pending_merge
2014-11-07 05:16:14 -08:00
1cc1bc8e81
fix broken photo edits when adult flag is changed
2014-11-07 05:15:39 -08:00
26343b8856
rev update
2014-11-07 05:15:28 -08:00
d17c15a992
doc updates
2014-11-07 05:14:53 -08:00
2cfe0f1545
provide lockstate for photo edit
2014-11-07 12:13:38 +01:00
f077badcb6
include self in load_contact_links so you don't get a connect menu entry for yourself
2014-11-06 23:50:54 -08:00
4543d3213a
Merge pull request #676 from magicoli/master
...
fix nbsp tag typoes in french translation
2014-11-07 17:40:01 +11:00
13fd91d6f5
fix nbsp tag typoes in french translation
2014-11-07 05:14:01 +01:00
c4a07010f7
visible flag reversed
2014-11-06 18:05:02 -08:00
1fbd1a79c7
Provide a way to mark photos as adult and hide them from the default album view. Still need a button or setting to enable "unsafe viewing". This has no effect anywhere but in the album views. They can still be viewed by flipping through the individual photos with 'prev' and 'next'. We probably need a comprehensive strategy for how to deal with n-s-f-w photos in albums so consider this a band-aid which requires additional work and integration with other facilities which access these photos. It is entirely optional.
2014-11-06 17:27:28 -08:00
91d255a056
Merge pull request #675 from zzottel/master
...
don't overwrite $x (contains import_xchan result) with role permissions
2014-11-07 06:39:11 +11:00
1f35d9432f
don't overwrite $x (contains import_xchan result) with role permissions
2014-11-06 17:24:05 +01:00
5e7e8d1089
provide a lockstate for photo uploads
2014-11-06 11:57:33 +01:00
a23435540e
make sure the "tagcloud" actually shows hashtags. So we don't confuse folks with categories.
2014-11-06 01:32:47 -08:00
4057e82bb4
category tagblock
2014-11-06 01:24:04 -08:00
1237957dd5
logging changes, untranslated string
2014-11-05 21:02:33 -08:00
038e7c8923
crude skeleton for location manager and the UI sucks but at least it's on a webpage and you don't have to do it by hand.
2014-11-05 18:39:10 -08:00
70b964d1c4
Merge https://github.com/friendica/red into pending_merge
2014-11-05 16:24:37 -08:00
3b22e2f5f5
some minor cleanup of unreported (and as yet undiscovered) issues with permissions toggling. No smoking guns and no obvious issues discovered here. Repeated and tried to duplicate zottell's issue as described without seeing any obvious problems.
2014-11-05 16:21:03 -08:00
9c9c18b4a6
Merge pull request #674 from pafcu/master
...
Fix duplicate element id
2014-11-06 06:48:06 +11:00
1a445a17d8
Fix duplicate element id
2014-11-05 17:19:46 +01:00
b16ee29cc3
release the navbar in landscape mode on small devices
2014-11-05 10:32:30 +01:00
74b3e0a7eb
changed notification description
2014-11-04 18:29:17 -08:00
1896855c85
minor adjustments to make the form work as designed
2014-11-04 17:38:49 -08:00
d5d6158973
ok heads up - potentially destabilising change. I've tried to sort out all the default connection permissions for those who don't have a predefined (or therefore have a "custom") permissions role. Unfortunately this includes most people that were using this software more than a month ago. The real changes are that the SELF address book entry no longer holds "auto-permissions" but instead holds your "default permissions" (if you have a pre-defined role, the defaults will be pulled from the role table).
...
The auto permissions have moved to a pconfig (uid.system.autoperms). A DB update will move these settings into their new homes.
What used to be the "Auto-permissions settings" page is now the "default permissions settings" page and a checkbox therein decides whether or not to apply the permissions automatically. A link to this page will only be shown when you have the "custom" role selected.
With luck nobody will notice anything wrong. But at least for the next few days, please review permissions that have been assigned to new connections (either automatically or manually) and make sure they make sense (e.g. they aren't "nothing"). You still need to take action when seeing a message "permissions have changed but not yet submitted" as we always let you review and perhaps adjust the settings _before_ a connection is established (unless you have autoperms turned on).
2014-11-04 17:11:02 -08:00
7a92157187
Merge https://github.com/friendica/red into pending_merge
2014-11-04 15:25:00 -08:00
ba7f1bb8ee
configurable visual alerts/notifications
2014-11-04 15:24:24 -08:00
474e7fff00
Remove legacy custom/
2014-11-04 19:40:00 +00:00
8163230e77
it appears bootbox was lost in a bootstrap upgrade
2014-11-04 11:34:09 -08:00
73e645fe3d
class > id mixup
2014-11-04 09:35:39 +01:00
ba73b60177
missing </div>
2014-11-04 09:29:11 +01:00
a80e696b77
wall posted comment to a top-level wall post which arrived via a route (e.g. was posted to a forum) had no route, hence downstream recipients report route mismatch
2014-11-03 17:35:42 -08:00
ca1df08d92
posted-date-selector - spacing was slightly off in dropdown entries
2014-11-03 16:57:30 -08:00
fdb9b9d52e
Merge https://github.com/friendica/red into pending_merge
2014-11-03 14:51:28 -08:00
a6d8c3193a
various UI issues related to having an enormous number of entries in the posted_date selector including years/months that had no posts
2014-11-03 14:49:03 -08:00
9984ff37e5
innodb issue
2014-11-03 15:33:59 +00:00
1d923d2b0d
one </div> to much and css fixes
2014-11-03 12:54:17 +01:00
1f1b6785cd
Merge branch 'master' of https://github.com/friendica/red
2014-11-03 11:19:59 +01:00
287d5e0f10
if uploading a photo go away to album
2014-11-03 11:19:27 +01:00
2f85d12a6c
if deleting a photo go away to album
2014-11-03 10:46:57 +01:00
ac858f4bd4
provide example import script
2014-11-03 01:06:02 -08:00
0e4f318b71
php warnings
2014-11-02 19:22:18 -08:00
b6e099dd5f
Merge https://github.com/friendica/red into pending_merge
2014-11-02 15:35:08 -08:00
285d6f61e4
I'm going to try again with the conversation request packets. I've looked this over and tested a lot of edge cases, and thought about from every angle I can think of to prevent looping. I don't *think* this can loop. I also doubt that this is the problem at friendicared.de, but I don't know for sure what that problem might be.
2014-11-02 15:28:20 -08:00
53292cfe86
Pixelbit restored. Going forwards, we probably want to add a check
...
that a directory is returning something in find_upstream_directory()
since this was spotted by a new install who thought *they* were
broken.
2014-11-02 19:51:22 +00:00
4adfe2c932
Merge branch 'master' of https://github.com/friendica/red
2014-11-02 19:47:00 +01:00
8cfe8a5f25
css fixes
2014-11-02 19:36:28 +01:00
zottel
friendica
marijus
Olivier van Helden (hal)
Stefan Parviainen
Thomas Willingham