Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8 from friendica/master | Paolo T | 2015-03-22 | 1707 | -191629/+21753 |
|\ | | | | | merging red master into nuvola.red | ||||
| * | move the maintenance part to include/sharedwithme.php | Mario Vavti | 2015-03-22 | 2 | -27/+35 |
| | | |||||
| * | do not override item_private here anymore | Mario Vavti | 2015-03-22 | 1 | -1/+1 |
| | | |||||
| * | fix multiple vote issues | friendica | 2015-03-21 | 1 | -2/+3 |
| | | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-21 | 7 | -159/+196 |
| |\ | |||||
| | * | Merge pull request #934 from dawnbreak/master | RedMatrix | 2015-03-22 | 3 | -155/+173 |
| | |\ | | | | | | | | | Bugfix und variable initialization. | ||||
| | | * | Fixed an exit of a loop in builtin_activity_puller(). | Klaus Weidenbach | 2015-03-21 | 1 | -128/+132 |
| | | | | | | | | | | | | | | | | There was a "$return", but I think it should be "return". | ||||
| | | * | Bugfix und variable initialization. | Klaus Weidenbach | 2015-03-21 | 2 | -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/red | Mario Vavti | 2015-03-21 | 6 | -407/+420 |
| | |\| | |||||
| | | * | Merge pull request #933 from dawnbreak/docu | RedMatrix | 2015-03-21 | 1 | -1/+2 |
| | | |\ | | | | | | | | | | | Extend Doxygen configuration a bit to display more. | ||||
| | | | * | Extend Doxygen configuration a bit to display more. | Klaus Weidenbach | 2015-03-21 | 1 | -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 visible | Mario Vavti | 2015-03-21 | 3 | -3/+21 |
| | | | | | |||||
| * | | | | add loadtime search to channel and fix it for home. display and search need ↵ | friendica | 2015-03-21 | 7 | -10/+55 |
| | |/ / | |/| | | | | | | | | | | further investigation | ||||
| * | | | change permission roles for things like channel admin to make them more ↵ | friendica | 2015-03-20 | 1 | -27/+27 |
| | |/ | |/| | | | | | | | easily manually settable from the connections edit page. | ||||
| * | | set to empty string so it doesn't get mis-handled as a null | friendica | 2015-03-20 | 1 | -0/+2 |
| | | | |||||
| * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-20 | 15 | -235/+342 |
| |\| | |||||
| | * | some tabs title statuseditor restructuring | Mario Vavti | 2015-03-21 | 3 | -12/+25 |
| | | | |||||
| | * | need the cloudpath before creating the object | Mario Vavti | 2015-03-20 | 1 | -4/+3 |
| | | | |||||
| | * | some cleanup | Mario Vavti | 2015-03-20 | 1 | -13/+8 |
| | | | |||||
| | * | possible improvement regarding deletion | Mario Vavti | 2015-03-20 | 2 | -31/+46 |
| | | | |||||
| | * | remove unused vars | Mario Vavti | 2015-03-20 | 1 | -2/+0 |
| | | | |||||
| | * | remove more $vars from style.css | Mario Vavti | 2015-03-20 | 10 | -189/+276 |
| | | | |||||
| * | | config to hide version tag from siteinfo - on my site it's meaningless. | friendica | 2015-03-20 | 4 | -379/+389 |
| |/ | |||||
| * | call parse_url from rpost and add the result to the content body if invoked ↵ | friendica | 2015-03-19 | 1 | -0/+5 |
| | | | | | | | | with a url argument | ||||
| * | Explicitly force link for 'All Collections' on the network page to gid=0 so ↵ | friendica | 2015-03-19 | 1 | -1/+1 |
| | | | | | | | | it can be used with a default page over-ride for gid. | ||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-19 | 14 | -201/+183 |
| |\ | |||||
| | * | there are no vars to replace in converse_center.css | Mario Vavti | 2015-03-19 | 1 | -1/+0 |
| | | | |||||
| | * | update schema doco a little. needs some more... | Mario Vavti | 2015-03-19 | 2 | -9/+12 |
| | | | |||||
| | * | remove more unused $vars | Mario Vavti | 2015-03-19 | 2 | -21/+0 |
| | | | |||||
| | * | remove more $vars from style.css | Mario Vavti | 2015-03-19 | 10 | -156/+156 |
| | | | |||||
| | * | remove $abook_changebg from style.css | Mario Vavti | 2015-03-19 | 10 | -14/+15 |
| | | | |||||
| | * | do not destroy page layout if feature_encrypt is not enabled | Mario Vavti | 2015-03-19 | 1 | -2/+2 |
| | | | |||||
| * | | tweaks to directory registrations which don't seem to be happening, also ↵ | friendica | 2015-03-19 | 4 | -9/+18 |
| | | | | | | | | | | | | downgrade any directory that claims to be a primary directory for RED_GLOBAL. | ||||
| * | | ratenotif: loop oddity | friendica | 2015-03-19 | 2 | -10/+10 |
| |/ | |||||
| * | make the channel item query match recent changes to network item query (and ↵ | friendica | 2015-03-18 | 3 | -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 ↵ | friendica | 2015-03-18 | 1 | -1/+1 |
| | | | | | | | | DAV storage we won't be stripping metadata by default. | ||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-18 | 7 | -2807/+2925 |
| |\ | |||||
| | * | remove px from default value | Mario Vavti | 2015-03-18 | 1 | -1/+1 |
| | | | |||||
| | * | just to be sure | Mario Vavti | 2015-03-18 | 2 | -2/+2 |
| | | | |||||
| | * | move body-font-size setting backt to expert. most people probably use ↵ | Mario Vavti | 2015-03-18 | 1 | -4/+1 |
| | | | | | | | | | | | | browser built in zoom capabilitie. | ||||
| | * | Merge branch 'master' of https://github.com/friendica/red | Mario Vavti | 2015-03-18 | 2 | -2785/+2906 |
| | |\ | |||||
| | | * | Update Dutch translations | jeroenpraat | 2015-03-18 | 2 | -2785/+2906 |
| | | | | |||||
| | * | | make every page regard max content width setting and move the setting out of ↵ | Mario Vavti | 2015-03-18 | 5 | -18/+18 |
| | |/ | | | | | | | | | | experts mode | ||||
| * / | we upped the php version requirement. So up yours. | friendica | 2015-03-18 | 2 | -2/+2 |
| |/ | |||||
| * | fix the map embed issue by keeping the map visible but moving it far off the ↵ | friendica | 2015-03-17 | 2 | -3/+8 |
| | | | | | | | | screen. | ||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-17 | 15 | -436/+840 |
| |\ | |||||
| | * | move bootbox out of bootstrap | Mario Vavti | 2015-03-17 | 3 | -1/+1 |
| | | | |||||
| | * | update bootstrap-3.3.4 and bootbox-4.4.0 | Mario Vavti | 2015-03-17 | 14 | -431/+835 |
| | | | |||||
| * | | ok it has to be owner. | friendica | 2015-03-17 | 1 | -3/+3 |
| |/ | |||||
| * | Merge branch 'master' of https://github.com/friendica/red | Mario Vavti | 2015-03-17 | 3 | -2820/+2941 |
| |\ |