aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* provide visual feedback when deleting a like by liking it again.friendica2015-03-225-8/+15
|
* fix multiple vote issuesfriendica2015-03-211-2/+3
|
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-217-159/+196
|\
| * Merge pull request #934 from dawnbreak/masterRedMatrix2015-03-223-155/+173
| |\ | | | | | | Bugfix und variable initialization.
| | * Fixed an exit of a loop in builtin_activity_puller().Klaus Weidenbach2015-03-211-128/+132
| | | | | | | | | | | | There was a "$return", but I think it should be "return".
| | * Bugfix und variable initialization.Klaus Weidenbach2015-03-212-27/+41
| | | | | | | | | | | | | | | Fixed a wrong perm_is_allowed() parameter, commented some other places where we use variables that are not set and should not work.
| * | Merge branch 'master' of https://github.com/friendica/redMario Vavti2015-03-216-407/+420
| |\|
| | * Merge pull request #933 from dawnbreak/docuRedMatrix2015-03-211-1/+2
| | |\ | | | | | | | | Extend Doxygen configuration a bit to display more.
| | | * Extend Doxygen configuration a bit to display more.Klaus Weidenbach2015-03-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add view of \license information in Doxygen information and add an overview page for \fixme which is used in source code. We have Bug List, Fixme List, Todo List and Deprecated List. Do we have some other tags we use that we could collect and display?
| * | | fix acl for if we have an cid in /network and make $bang better visibleMario Vavti2015-03-213-3/+21
| | | |
* | | | add loadtime search to channel and fix it for home. display and search need ↵friendica2015-03-217-10/+55
| |/ / |/| | | | | | | | further investigation
* | | change permission roles for things like channel admin to make them more ↵friendica2015-03-201-27/+27
| |/ |/| | | | | easily manually settable from the connections edit page.
* | set to empty string so it doesn't get mis-handled as a nullfriendica2015-03-201-0/+2
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-2015-235/+342
|\|
| * some tabs title statuseditor restructuringMario Vavti2015-03-213-12/+25
| |
| * need the cloudpath before creating the objectMario Vavti2015-03-201-4/+3
| |
| * some cleanupMario Vavti2015-03-201-13/+8
| |
| * possible improvement regarding deletionMario Vavti2015-03-202-31/+46
| |
| * remove unused varsMario Vavti2015-03-201-2/+0
| |
| * remove more $vars from style.cssMario Vavti2015-03-2010-189/+276
| |
* | config to hide version tag from siteinfo - on my site it's meaningless.friendica2015-03-204-379/+389
|/
* call parse_url from rpost and add the result to the content body if invoked ↵friendica2015-03-191-0/+5
| | | | with a url argument
* Explicitly force link for 'All Collections' on the network page to gid=0 so ↵friendica2015-03-191-1/+1
| | | | it can be used with a default page over-ride for gid.
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-1914-201/+183
|\
| * there are no vars to replace in converse_center.cssMario Vavti2015-03-191-1/+0
| |
| * update schema doco a little. needs some more...Mario Vavti2015-03-192-9/+12
| |
| * remove more unused $varsMario Vavti2015-03-192-21/+0
| |
| * remove more $vars from style.cssMario Vavti2015-03-1910-156/+156
| |
| * remove $abook_changebg from style.cssMario Vavti2015-03-1910-14/+15
| |
| * do not destroy page layout if feature_encrypt is not enabledMario Vavti2015-03-191-2/+2
| |
* | tweaks to directory registrations which don't seem to be happening, also ↵friendica2015-03-194-9/+18
| | | | | | | | downgrade any directory that claims to be a primary directory for RED_GLOBAL.
* | ratenotif: loop oddityfriendica2015-03-192-10/+10
|/
* 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
| | |