Commit graph

11845 commits

Author SHA1 Message Date
Stefan Parviainen
28f3d7be5a New layout for directory 2014-11-09 00:18:26 +01:00
Stefan Parviainen
b5fad9feef Fix merge conflict 2014-11-08 20:53:41 +01:00
Stefan Parviainen
89aea08182 Highlight badge on hover 2014-11-08 20:30:33 +01:00
Stefan Parviainen
1a8fc73b57 Fix highlighting of login button 2014-11-08 20:06:08 +01:00
Thomas Willingham
b29a968be8 Document reinstalling, or saying don't do that without explicitly stating don't do that. 2014-11-08 00:17:53 +00:00
zzottel
d60d4dcff5 Merge pull request #678 from zzottel/master
update to German help files
2014-11-07 22:48:09 +01:00
zottel
add493ef4d update to German help files 2014-11-07 22:46:39 +01:00
zzottel
564af20563 Merge pull request #677 from zzottel/master
update to German strings
2014-11-07 22:20:32 +01:00
zottel
a22ba7629b update to German strings 2014-11-07 22:19:17 +01:00
friendica
55f64c3736 tgroup_check - decrypt if obscured before checking body text for reshares 2014-11-07 13:06:56 -08:00
friendica
961049f5fa revert that bit 2014-11-07 12:16:13 -08:00
friendica
b6ae56b069 Merge https://github.com/friendica/red into pending_merge 2014-11-07 05:16:14 -08:00
friendica
1cc1bc8e81 fix broken photo edits when adult flag is changed 2014-11-07 05:15:39 -08:00
friendica
26343b8856 rev update 2014-11-07 05:15:28 -08:00
friendica
d17c15a992 doc updates 2014-11-07 05:14:53 -08:00
marijus
2cfe0f1545 provide lockstate for photo edit 2014-11-07 12:13:38 +01:00
friendica
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
RedMatrix
4543d3213a Merge pull request #676 from magicoli/master
fix nbsp tag typoes in french translation
2014-11-07 17:40:01 +11:00
Olivier van Helden (hal)
13fd91d6f5 fix nbsp tag typoes in french translation 2014-11-07 05:14:01 +01:00
friendica
c4a07010f7 visible flag reversed 2014-11-06 18:05:02 -08:00
friendica
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
RedMatrix
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
zottel
1f35d9432f don't overwrite $x (contains import_xchan result) with role permissions 2014-11-06 17:24:05 +01:00
marijus
5e7e8d1089 provide a lockstate for photo uploads 2014-11-06 11:57:33 +01:00
friendica
a23435540e make sure the "tagcloud" actually shows hashtags. So we don't confuse folks with categories. 2014-11-06 01:32:47 -08:00
friendica
4057e82bb4 category tagblock 2014-11-06 01:24:04 -08:00
friendica
1237957dd5 logging changes, untranslated string 2014-11-05 21:02:33 -08:00
friendica
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
friendica
70b964d1c4 Merge https://github.com/friendica/red into pending_merge 2014-11-05 16:24:37 -08:00
friendica
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
RedMatrix
9c9c18b4a6 Merge pull request #674 from pafcu/master
Fix duplicate element id
2014-11-06 06:48:06 +11:00
Stefan Parviainen
1a445a17d8 Fix duplicate element id 2014-11-05 17:19:46 +01:00
marijus
b16ee29cc3 release the navbar in landscape mode on small devices 2014-11-05 10:32:30 +01:00
friendica
74b3e0a7eb changed notification description 2014-11-04 18:29:17 -08:00
friendica
1896855c85 minor adjustments to make the form work as designed 2014-11-04 17:38:49 -08:00
friendica
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
friendica
7a92157187 Merge https://github.com/friendica/red into pending_merge 2014-11-04 15:25:00 -08:00
friendica
ba7f1bb8ee configurable visual alerts/notifications 2014-11-04 15:24:24 -08:00
Thomas Willingham
474e7fff00 Remove legacy custom/ 2014-11-04 19:40:00 +00:00
friendica
8163230e77 it appears bootbox was lost in a bootstrap upgrade 2014-11-04 11:34:09 -08:00
marijus
73e645fe3d class > id mixup 2014-11-04 09:35:39 +01:00
marijus
ba73b60177 missing </div> 2014-11-04 09:29:11 +01:00
friendica
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
friendica
ca1df08d92 posted-date-selector - spacing was slightly off in dropdown entries 2014-11-03 16:57:30 -08:00
friendica
fdb9b9d52e Merge https://github.com/friendica/red into pending_merge 2014-11-03 14:51:28 -08:00
friendica
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
Thomas Willingham
9984ff37e5 innodb issue 2014-11-03 15:33:59 +00:00
marijus
1d923d2b0d one </div> to much and css fixes 2014-11-03 12:54:17 +01:00
marijus
1f1b6785cd Merge branch 'master' of https://github.com/friendica/red 2014-11-03 11:19:59 +01:00
marijus
287d5e0f10 if uploading a photo go away to album 2014-11-03 11:19:27 +01:00