Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | testing new event code | friendica | 2014-05-29 | 4 | -64/+14 |
| | |||||
* | newevent: front end functions | friendica | 2014-05-29 | 4 | -4/+27 |
| | |||||
* | more work on new event code | friendica | 2014-05-29 | 1 | -58/+46 |
| | |||||
* | event_addtocal function for storing received events | friendica | 2014-05-29 | 1 | -6/+52 |
| | |||||
* | start to tie in the new event logic | friendica | 2014-05-29 | 2 | -3/+4 |
| | |||||
* | split event storage into two bits - separate the event storage from the ↵ | friendica | 2014-05-29 | 1 | -65/+77 |
| | | | | associated item storage | ||||
* | Merge branch 'master' into newevent | friendica | 2014-05-29 | 236 | -19655/+23763 |
|\ | | | | | | | | | Conflicts: include/zot.php | ||||
| * | this is an important bit - only mark dead hubs on directory servers. They ↵ | friendica | 2014-05-29 | 2 | -1/+5 |
| | | | | | | | | shouldn't matter anywhere else. | ||||
| * | cleanup dead directory entries. This was a real b#tch, so keep your eye out ↵ | friendica | 2014-05-28 | 5 | -19/+109 |
| | | | | | | | | for issues - which you shouldn't see until next weekend when this is scheduled to run. We're only setting flags, so if anything goes wrong we should be able to recover without too much pain. | ||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-05-28 | 2 | -1/+2 |
| |\ | |||||
| | * | Merge pull request #474 from solstag/master | RedMatrix | 2014-05-29 | 2 | -1/+2 |
| | |\ | | | | | | | | | fix links to doco regarding translation | ||||
| | | * | fix links to doco regarding translation | Alexandre Hannud Abdo | 2014-05-28 | 2 | -1/+2 |
| | |/ | |||||
| * / | moods: simplify 'xyz is tired' rather than 'xyz is currently tired'. This is ↵ | friendica | 2014-05-28 | 3 | -10/+3 |
| |/ | | | | | | | possible now that we have translation contexts, as before '$1 is $2' was ambiguous without a context - in this case 'mood'. | ||||
| * | logging: include target url when reporting z_fetch_url and z_post_url errors. | friendica | 2014-05-27 | 1 | -4/+4 |
| | | |||||
| * | added note about the chunked-encoding fiasco. | friendica | 2014-05-27 | 1 | -0/+5 |
| | | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-05-27 | 3 | -26/+8 |
| |\ | |||||
| | * | some fixes and cleanup | marijus | 2014-05-27 | 3 | -26/+8 |
| | | | |||||
| * | | give the cloud file list a bit of padding | friendica | 2014-05-27 | 4 | -24/+29 |
| |/ | |||||
| * | Still a bit of work on remote app install, but we can check that one off the ↵ | friendica | 2014-05-26 | 2 | -4/+0 |
| | | | | | | | | list. | ||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-05-26 | 6 | -10/+11 |
| |\ | |||||
| | * | fix one more bootstrap override regression - addendum | marijus | 2014-05-26 | 1 | -0/+1 |
| | | | |||||
| | * | fix one more bootstrap override regression | marijus | 2014-05-26 | 4 | -6/+5 |
| | | | |||||
| | * | divide autodate from item.app | 23n | 2014-05-26 | 1 | -1/+1 |
| | | | |||||
| | * | Collapsed textareas are like buttons. They should not grow/shrink in size if ↵ | marijus | 2014-05-26 | 2 | -3/+4 |
| | | | | | | | | | | | | app font-size changes. | ||||
| * | | move some zot doco to our doc area and start on zot_structures | friendica | 2014-05-26 | 4 | -1/+571 |
| |/ | |||||
| * | filter randprof results to avoid channels that are known to be deceased. | friendica | 2014-05-25 | 1 | -1/+1 |
| | | |||||
| * | auto-highlight app embed code on click | friendica | 2014-05-25 | 2 | -2/+2 |
| | | |||||
| * | missing "app installed" info msg | friendica | 2014-05-25 | 1 | -0/+4 |
| | | |||||
| * | icon for randprof | friendica | 2014-05-25 | 2 | -0/+1 |
| | | |||||
| * | fix the intermittent theme preview | friendica | 2014-05-25 | 3 | -5/+3 |
| | | |||||
| * | Merge pull request #473 from git-marijus/master | RedMatrix | 2014-05-25 | 3 | -13/+30 |
| |\ | | | | | | | possible fix for empty commentbox collapsing on tool-button click | ||||
| | * | for some reason this is also needed to make it work reliable in webkit browsers | marijus | 2014-05-24 | 2 | -1/+11 |
| | | | |||||
| | * | should be redbasic not red | marijus | 2014-05-24 | 2 | -2/+2 |
| | | | |||||
| | * | possible fix for empty commentbox colapsing on tool-button click | marijus | 2014-05-24 | 3 | -13/+20 |
| |/ | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-05-24 | 2 | -5/+3 |
| |\ | |||||
| | * | Merge pull request #471 from solstag/master | RedMatrix | 2014-05-24 | 2 | -5/+3 |
| | |\ | | | | | | | | | Language selection: case-insensitive and system language | ||||
| | | * | Language selection: case-insensitive and system language | Alexandre Hannud Abdo | 2014-05-23 | 2 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed ignoring HTTP_ACCEPT_LANGUAGE tags that had uppercase characters. Fixed defining a->language too soon to ever get the system lang | ||||
| * | | | app basic style | friendica | 2014-05-24 | 2 | -1/+7 |
| |/ / | |||||
| * | | add randprof app and do away with the universally hated chanview-iframe ↵ | friendica | 2014-05-23 | 5 | -13/+18 |
| | | | | | | | | | | | | mode. It's gone. Please do not try and bring it back. We are not Diaspora and we have no desire to be like them. ("And they're all made out of ticky-tacky and they all look just the same"). Our profiles do not have to look the same and they won't anyway. We don't have to sugar coat the fact that some of the content in the matrix doesn't look like the rest of the content in the matrix. | ||||
| * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-05-23 | 2 | -5322/+5214 |
| |\| | |||||
| | * | Merge pull request #470 from solstag/master | RedMatrix | 2014-05-23 | 2 | -5322/+5214 |
| | |\ | | | | | | | | | update pt-br translation | ||||
| | | * | update pt-br translation | Alexandre Hannud Abdo | 2014-05-23 | 2 | -5322/+5214 |
| | |/ | |||||
| * | | doc additions | friendica | 2014-05-23 | 2 | -0/+160 |
| | | | |||||
| * | | add profile photo app because it is sometimes hard to find. Also doc updates | friendica | 2014-05-23 | 57 | -3977/+4650 |
| |/ | |||||
| * | fix search to use in app | friendica | 2014-05-22 | 5 | -5/+12 |
| | | |||||
| * | more apps | friendica | 2014-05-22 | 5 | -0/+10 |
| | | |||||
| * | implement 'requires' on personal apps | friendica | 2014-05-22 | 4 | -8/+53 |
| | | |||||
| * | couple more apps | friendica | 2014-05-22 | 4 | -0/+8 |
| | | |||||
| * | replace photos app icon | friendica | 2014-05-22 | 1 | -0/+0 |
| | | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-05-22 | 4 | -5328/+5220 |
| |\ |