aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* do not destroy page layout if feature_encrypt is not enabledMario Vavti2015-03-191-2/+2
|
* make the channel item query match recent changes to network item query (and ↵friendica2015-03-183-5/+7
| | | | some slightly older changes in display item query), and allow '@' in linkified urls.
* Change wording on the photo location feature. When photos are merged with ↵friendica2015-03-181-1/+1
| | | | DAV storage we won't be stripping metadata by default.
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-187-2807/+2925
|\
| * remove px from default valueMario Vavti2015-03-181-1/+1
| |
| * just to be sureMario Vavti2015-03-182-2/+2
| |
| * move body-font-size setting backt to expert. most people probably use ↵Mario Vavti2015-03-181-4/+1
| | | | | | | | browser built in zoom capabilitie.
| * Merge branch 'master' of https://github.com/friendica/redMario Vavti2015-03-182-2785/+2906
| |\
| | * Update Dutch translationsjeroenpraat2015-03-182-2785/+2906
| | |
| * | make every page regard max content width setting and move the setting out of ↵Mario Vavti2015-03-185-18/+18
| |/ | | | | | | experts mode
* / we upped the php version requirement. So up yours.friendica2015-03-182-2/+2
|/
* fix the map embed issue by keeping the map visible but moving it far off the ↵friendica2015-03-172-3/+8
| | | | screen.
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-1715-436/+840
|\
| * move bootbox out of bootstrapMario Vavti2015-03-173-1/+1
| |
| * update bootstrap-3.3.4 and bootbox-4.4.0Mario Vavti2015-03-1714-431/+835
| |
* | ok it has to be owner.friendica2015-03-171-3/+3
|/
* Merge branch 'master' of https://github.com/friendica/redMario Vavti2015-03-173-2820/+2941
|\
| * Merge pull request #932 from tuscanhobbit/devPaolo T2015-03-172-2818/+2939
| |\ | | | | | | Updated Italian strings
| | * Updated Italian stringsPaolo Tacconi2015-03-172-2818/+2939
| | |
| * | get the correct hemisphere for geotagged photosfriendica2015-03-171-2/+2
| | |
* | | update templatesMario Vavti2015-03-174-6/+18
|/ /
* | turn photo location mapping into a featurefriendica2015-03-172-1/+2
| |
* | The random bad signatures are because something somewhere is trimming the ↵friendica2015-03-173-4/+4
| | | | | | | | body text. It could be any one of hundreds of functions that touch the message body. We really want to trim the body text, so I'm putting back all the trim statements - in mod/item and item_store and item_store_update. The last fix for random bad sigs noted that one of the trims wasn't there, so the others were removed. The correct fix is for all the trims to be there. We will probably have a few (quite a few) bad sigs during the transition back to trimmed text but this should nail it for anybody on recent code and with new content.
* | display a map for photos if allowed. Note: there is a bug in that if the map ↵friendica2015-03-164-1/+59
| | | | | | | | div starts with display:none one needs to reload the frame or zoom in or they end up at minimum resolution. Still trying to sort this out.
* | started to add the ability to geotag photos (default will be disabled) but ↵friendica2015-03-162-3/+12
| | | | | | | | my phone isn't outputting the GPS tags even after being explicitly enabled so I'll have to wait until I've got a device that I can reliably test against.
* | regression: visual feedback that page/content is loading when affinity ↵friendica2015-03-161-0/+2
| | | | | | | | slider value changed went missing
* | openid cleanupfriendica2015-03-163-105/+73
| |
* | make sure this sucker is quietfriendica2015-03-161-1/+1
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-161-0/+2
|\ \
| * | show generic submit button only if plugin name is providedMario Vavti2015-03-161-0/+2
| | |
* | | also update the api to matchfriendica2015-03-161-2/+2
| | |
* | | phase one of the great file storage unification - use one button for uploads ↵friendica2015-03-164-17/+34
|/ / | | | | | | of any type (image or attachment). We'll sort out which one it is and deal with it appropriately.
* | start on some db_table docofriendica2015-03-152-14/+44
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-1514-1338/+1259
|\ \
| * \ Merge pull request #931 from dawnbreak/masterRedMatrix2015-03-1614-1338/+1259
| |\ \ | | | | | | | | Some JavaScript cleanups.
| | * | Documentation and remove duplicate code.Klaus Weidenbach2015-03-161-72/+79
| | | | | | | | | | | | | | | | | | | | Add a bit Doxygen documentation and remove some duplicate code from account.php.
| | * | Some JavaScript cleanups.Klaus Weidenbach2015-03-1513-1266/+1180
| |/ / | | | | | | | | | | | | | | | Adding some missing and remove some unnecessary semicolons. Change some comparing operators. Changed access to objects with dot operator.
* | | mod_id: load profile so the sidebar profile will workfriendica2015-03-152-39/+20
| | |
* | | Show profile on openid server pagefriendica2015-03-151-0/+4
| | |
* | | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-152-7/+12
|\| |
| * | assure that badges will be displayed as circles no matter what font is used ↵Mario Vavti2015-03-142-7/+12
| | | | | | | | | | | | and if there is only one digit inside. move css to its proper place
* | | mysql schema typo, do the install check for store before chcking smarty, as ↵friendica2015-03-154-6/+6
|/ / | | | | | | that is where the dir is created, change install doc to point to install/schema_xxxxx.sql instead of database.sql
* | revert the revert - that is working. My test was bad.friendica2015-03-141-3/+3
| |
* | revert and rethinkfriendica2015-03-142-4/+4
| |
* | create terms for Diaspora mention tags - which in Diaspora are handled ↵friendica2015-03-132-9/+103
| | | | | | | | differently than other tag links and have to be done separately; they aren't processed by linkify_tags which handles all of our other tag processing. Also move the abook_channel clause in mod_network to the join statement. This works fine in mysql and achievies the desired result. I hope postgres can handle an expression as a join clause.
* | Merge pull request #929 from zzottel/masterRedMatrix2015-03-141-3/+3
|\ \ | | | | | | fix posts not showing up in network if author is not in connections
| * | fix posts not showing up in network if author is not in connectionszottel2015-03-141-3/+3
| | |
* | | Merge pull request #928 from dawnbreak/docuRedMatrix2015-03-142-29/+69
|\ \ \ | |/ / |/| | Some documentation, fix chatroom service class lookup.
| * | Some documentation, fix chatroom service class lookup.Klaus Weidenbach2015-03-142-29/+69
| | | | | | | | | | | | | | | Add some Doxygen documentation and fixing a service class lookup for chatroom_create().
* | | use local_channel() connnections to match the abook against when joining the ↵friendica2015-03-131-2/+2
| | | | | | | | | | | | abook on the discover tab.