Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge pull request #576 from beardy-unixer/master | RedMatrix | 2014-09-02 | 5 | -15/+54 | |
|\ | | | | | Allow directories to stop being directories without killing anyone. | |||||
| * | Don't forget the ifs. Now we just need to write some blurb, find some | Thomas Willingham | 2014-09-02 | 1 | -4/+4 | |
| | | | | | | | | | | images, add a link, and decide what to do with non-earned badges...basically all of it. | |||||
| * | Move achievements on, but just a tad. | Thomas Willingham | 2014-09-02 | 2 | -10/+22 | |
| | | ||||||
| * | If you have a new channel (or a new hub searching for an old channel) | Thomas Willingham | 2014-09-02 | 1 | -5/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | which uses an xchan_url other than channel or profile, chanview will fail to find $a->poi and fail as there is no way to import the xchan. Instead of giving up and presenting an error, we'll send you to the requested URL anyway. If we send you with a Zid, there's a good chance you'll authenticate because xchans are like glitter - once you've got one, they get everywhere, and there's a good chance you'll know *somebody* at the hub. . | |||||
| * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2014-09-02 | 17 | -1411/+1673 | |
| |\ | |/ |/| | ||||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-01 | 2 | -1337/+1389 | |
|\ \ | ||||||
| * \ | Merge pull request #577 from tuscanhobbit/master | Paolo T | 2014-09-01 | 2 | -1337/+1389 | |
| |\ \ | | | | | | | | | Italian strings updated | |||||
| | * | | Italian strings updated | Paolo Tacconi | 2014-09-01 | 2 | -3/+3 | |
| | | | | ||||||
| | * | | Italian strings updated | Paolo Tacconi | 2014-09-01 | 2 | -1335/+1387 | |
| | | | | ||||||
* | | | | use feed icon as default avatar for rss connections | friendica | 2014-09-01 | 3 | -3/+6 | |
|/ / / | ||||||
* | | | make fuckin twitter plugin work by selling my soul to the devil for a fuckin ↵ | friendica | 2014-09-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | api key. Are y'all fuckin happy? | |||||
* | | | honour the feed_contacts setting | friendica | 2014-09-01 | 2 | -1/+6 | |
| | | | ||||||
* | | | get out the sunnies | friendica | 2014-08-31 | 5 | -8/+33 | |
| | | | ||||||
* | | | various rss fixes | friendica | 2014-08-31 | 2 | -11/+25 | |
| | | | ||||||
* | | | service class check for feeds. Note limit is account based, not channel based. | friendica | 2014-08-31 | 1 | -21/+33 | |
| | | | ||||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-08-31 | 1 | -4/+4 | |
|\ \ \ | ||||||
| * | | | Finally updated/re-translated the Dutch introduction text | Jeroen | 2014-08-31 | 1 | -4/+4 | |
| | | | | ||||||
* | | | | rss feed discovery | friendica | 2014-08-31 | 2 | -25/+178 | |
|/ / / | ||||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-08-31 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | missing ' | jeroenpraat | 2014-08-31 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | sql error in profile_activity | friendica | 2014-08-31 | 3 | -6/+4 | |
|/ / / | ||||||
| | * | Add check_upstream_directory() to check that your directory is still | Thomas Willingham | 2014-08-31 | 2 | -0/+23 | |
| |/ |/| | | | | | | | a directory, and if it isn't, let find_upstream_directory() find you a new one. | |||||
* | | doc change - read it. | friendica | 2014-08-30 | 1 | -0/+3 | |
| | | ||||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-08-30 | 4 | -910/+973 | |
|\ \ | ||||||
| * | | update nl + Friendica>RedMatrix in two text files | Jeroen | 2014-08-30 | 4 | -910/+973 | |
| | | | ||||||
* | | | insecure network filter | friendica | 2014-08-30 | 2 | -2/+41 | |
|/ / | ||||||
* | | various diaspora issues | friendica | 2014-08-29 | 5 | -22/+82 | |
| | | ||||||
* | | doc update | friendica | 2014-08-29 | 46 | -990/+1157 | |
| | | ||||||
* | | more queue tweaks | friendica | 2014-08-28 | 2 | -2/+2 | |
| | | ||||||
* | | the queue driver is universal now - we don't need to filter it. | friendica | 2014-08-28 | 1 | -1/+1 | |
| | | ||||||
* | | except for a typo | friendica | 2014-08-28 | 1 | -3/+1 | |
| | | ||||||
* | | fix saving of extended profile attributes | friendica | 2014-08-28 | 1 | -0/+38 | |
| | | ||||||
* | | lots of little Diaspora issues | friendica | 2014-08-28 | 4 | -10/+46 | |
| | | ||||||
* | | retro-actively set standalone directory fix, also a fix for directory ↵ | friendica | 2014-08-28 | 2 | -1/+12 | |
| | | | | | | | | endless scroll when you hit the end. | |||||
* | | remove noisy log statement | friendica | 2014-08-28 | 1 | -2/+0 | |
| | | ||||||
* | | when updating the commented timestamp on the parent post (item_store) don't ↵ | friendica | 2014-08-28 | 2 | -2/+5 | |
| | | | | | | | | include any time travelling posts. They can mess up the conversation sort order in a big way until they're actually published. | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-08-28 | 2 | -11/+3 | |
|\ \ | ||||||
| * \ | Merge pull request #575 from encyclomundi/master | RedMatrix | 2014-08-29 | 1 | -1/+1 | |
| |\ \ | | | | | | | | | change the name of the app from Channel Select to Channel Manager | |||||
| | * | | change the name of the app from Channel Select to Channel Manager | Charles | 2014-08-28 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | minor css fixes and cleanup | marijus | 2014-08-28 | 1 | -10/+2 | |
| | | | ||||||
* | | | Ability to close comments at a certain date/time - needed for loom.io ↵ | friendica | 2014-08-28 | 6 | -58/+106 | |
|/ / | | | | | | | emulation (and many other uses) | |||||
* | | let's make this "specific" since that's what it is. | friendica | 2014-08-28 | 2 | -1/+3 | |
| | | ||||||
* | | really really really fix lockview - maybe | friendica | 2014-08-28 | 1 | -2/+3 | |
| | | ||||||
* | | consistency: the diaspora post plugin uses "diaspora_enable". The protocol ↵ | friendica | 2014-08-28 | 2 | -4/+4 | |
| | | | | | | | | driver uses "diaspora_enabled" with a 'd'. They got mixed up in a couple of places. | |||||
* | | make blocks, webpages, and layouts postable (pre-filled forms if supplied ↵ | friendica | 2014-08-28 | 4 | -10/+31 | |
| | | | | | | | | from elsewhere). The only serious issue is with ordering - you have to process and save a named layout before you can save a webpage that uses that layout name. Otherwise it will get unset during the save. | |||||
* | | begin embeddable/shareable design elements (blocks, webpages, layouts, ↵ | friendica | 2014-08-27 | 2 | -2/+34 | |
| | | | | | | | | menus, etc.) | |||||
* | | ability to create/edit/delete custom profile field definitions - read the ↵ | friendica | 2014-08-27 | 4 | -1/+91 | |
| | | | | | | | | source. Currently the created entries aren't added to the allowed fields arrays, but this can be done by hand until that bit is made available. Only choice for input type at the moment is 'text' or a text input, not a textarea. Multiple choice will be added later. | |||||
* | | mind numbing drudgery continued... | friendica | 2014-08-27 | 4 | -85/+76 | |
| | | ||||||
* | | Admin setting for Diaspora Protocol enable. We may want to have this also at ↵ | friendica | 2014-08-27 | 2 | -0/+4 | |
| | | | | | | | | a channel level since there are privacy issues and quirks and trade-offs. | |||||
* | | thanks thomas... | friendica | 2014-08-27 | 1 | -0/+68 | |
| | |