Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Upstream merge | Christian Vogeley | 2013-09-15 | 9 | -1310/+1640 |
|\ | |||||
| * | Merge https://github.com/friendica/red into zpull | friendica | 2013-09-14 | 1 | -1303/+1611 |
| |\ | |||||
| | * | Merge pull request #132 from pixelroot/master | Olaf Conradi | 2013-09-14 | 1 | -1303/+1611 |
| | |\ | | | | | | | | | modified: view/ru/messages.po | ||||
| | | * | modified: view/ru/messages.po | pixelroot | 2013-09-13 | 1 | -1303/+1611 |
| | | | | |||||
| * | | | this might fix "find channels" but I can't test the keyword search until ↵ | friendica | 2013-09-14 | 1 | -1/+1 |
| |/ / | | | | | | | | | | this is running on a production site. | ||||
| * | | Admin templates. | Thomas Willingham | 2013-09-10 | 6 | -6/+6 |
| | | | |||||
| * | | Quick and dirty file storage module. | Thomas Willingham | 2013-09-09 | 1 | -0/+22 |
| | | | |||||
* | | | Search by date | Christian Vogeley | 2013-09-15 | 1 | -1/+1 |
|/ / | | | | | | | Search by date (archive) works a bit now | ||||
* | | Merge service class | Christian Vogeley | 2013-09-08 | 3 | -1/+9 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | //service class configure in .htconfig.php: $a->config['system']['default_service_class']='standard'; // this is the default service class that is attached to every new account $a->config['service_class']['standard'] = array('photo_upload_limit'=>20000000, // total photo storage limit per channel (here 20MB) 'total_identities' =>5, // number of channels an account can create 'total_items' =>2000, // number of top level posts a channel can create. Applies only to top level posts of the user, other posts and comments are unaffected 'total_pages' =>10, // number of pages a channel can create 'total_channels' =>500, // number of channels the user can add, other users can still add this channel, even if the limit is reached 'attach_upload_limit' =>20000000); // total attachment storage limit per channel (here 20MB) | ||||
| * | | Service class | Christian Vogeley | 2013-09-08 | 3 | -1/+9 |
| | | | | | | | | | | | | identity, follow, photo upload, att upload | ||||
* | | | More content wrappers. | Thomas Willingham | 2013-09-08 | 6 | -2/+12 |
| | | | |||||
* | | | filter by category fixes | Michael Johnston | 2013-09-06 | 1 | -1/+1 |
| | | | |||||
* | | | Fix new menu link. | Thomas Willingham | 2013-09-06 | 1 | -1/+1 |
| | | | |||||
* | | | Redbasic - optimise mail list. | Thomas Willingham | 2013-09-06 | 2 | -28/+11 |
| | | | |||||
* | | | Redbasic - some more CSS we don't use. | Thomas Willingham | 2013-09-06 | 1 | -181/+3 |
| | | | |||||
* | | | Redbasic - clean up nav. | Thomas Willingham | 2013-09-06 | 2 | -64/+5 |
| | | | |||||
* | | | make displaying the language selector configurable | friendica | 2013-09-03 | 1 | -1/+1 |
| | | | |||||
* | | | fix mod/search_ac (sort of) | friendica | 2013-09-02 | 1 | -1/+1 |
| | | | |||||
* | | | add a layout selector | friendica | 2013-09-02 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #109 from tuscanhobbit/master | Thomas Willingham | 2013-09-02 | 2 | -1258/+1322 |
|\ \ \ | | | | | | | | | complete and updated Italian translation | ||||
| * | | | complete and updated Italian translation | tuscanhobbit | 2013-09-02 | 2 | -1258/+1322 |
| | | | | |||||
* | | | | webpage content-type -- needs cleaning up and a security check once all the ↵ | friendica | 2013-09-02 | 1 | -0/+3 |
| |/ / |/| | | | | | | | | important bits are in place. | ||||
* | | | silence some warnings at php E_ALL levels | friendica | 2013-08-28 | 1 | -5/+1 |
| | | | |||||
* | | | bring back mail list and cleanup some issues which popped out with full PHP ↵ | friendica | 2013-08-27 | 1 | -1/+1 |
| | | | | | | | | | | | | warnings | ||||
* | | | Preparatory work for photo conversations (third time). Also take away unused ↵ | friendica | 2013-08-27 | 2 | -3/+6 |
| | | | | | | | | | | | | "post new activity" preferences until they actually do something. | ||||
* | | | get rid of ssl_policy - it's implicit in the site url | friendica | 2013-08-27 | 1 | -4/+4 |
| | | | |||||
* | | | Typo | Thomas Willingham | 2013-08-24 | 1 | -1/+1 |
| | | | |||||
* | | | Another one. | Thomas Willingham | 2013-08-24 | 1 | -0/+2 |
| | | | |||||
* | | | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2013-08-24 | 14 | -8961/+6322 |
|\ \ \ | |||||
| * | | | Make footers position fixed, so that its content appears | Christian Vogeley | 2013-08-24 | 1 | -0/+2 |
| | | | | |||||
| * | | | premium/restricted channel connections implemented, configure at ↵ | friendica | 2013-08-21 | 2 | -0/+31 |
| | | | | | | | | | | | | | | | | yoursite/channel/nickname - this basically redirects "follow" requests to a premium channel's sell page if it has one configured. You can still click through and create a connection request (introduction), but this provides a means for the channel owner to state their terms. If you don't abide by the terms, you will likely be blocked or the channel deleted. This facility is extensible in a number of ways. | ||||
| * | | | progress on generic sellpage - is not yet linked from existing connect ↵ | friendica | 2013-08-21 | 3 | -0/+15 |
| |/ / | | | | | | | | | | buttons and editing has not been completed | ||||
| * | | Merge pull request #101 from tuscanhobbit/master | friendica | 2013-08-20 | 2 | -8956/+6225 |
| |\ \ | | | | | | | | | Italian translation (Thanks!) | ||||
| | * | | First version of Italian translation | p.tacconi | 2013-08-20 | 2 | -5/+5 |
| | | | | |||||
| | * | | First version of Italian translation | p.tacconi | 2013-08-20 | 2 | -8954/+6223 |
| | | | | |||||
| * | | | email attachments (and fix email photos) | friendica | 2013-08-19 | 3 | -3/+33 |
| | | | | |||||
| * | | | if changing primary hub during an import operation - remove the old xchan ↵ | friendica | 2013-08-19 | 1 | -1/+1 |
| |/ / | | | | | | | | | | and create a fresh xchan pointing at this instance. Also a minor edit to increase the default photo upload limit for new sites. There aren't many cameras left that will take photos < 800k in size. | ||||
| * | | issue #82, posted order not working - also doc update | friendica | 2013-08-17 | 1 | -0/+1 |
| | | | |||||
| * | | fix import from file | friendica | 2013-08-15 | 1 | -1/+1 |
| | | | |||||
| * | | move js from matrix page | friendica | 2013-08-15 | 1 | -0/+9 |
| | | | |||||
| * | | Merge pull request #96 from beardy-unixer/master | friendica | 2013-08-14 | 2 | -4/+8 |
| |\ \ | | | | | | | | | Webpages | ||||
| * | | | most of expire is now ported from friendica, but the protocol bits to push ↵ | friendica | 2013-08-14 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | out the delete notifications for the entire batch to all recipients of the original post are not complete and will take quite a bit more work. As a consequence, expire has been completely disabled until it is fully implmented since it could result in completely un-removable posts reminiscent of the infamous "Bonnie Nadri" incident at Diaspora which we do not wish to re-live. | ||||
* | | | | Generic wrapper classes makes themeing loads easier | Thomas Willingham | 2013-08-24 | 6 | -14/+20 |
| |/ / |/| | | |||||
* | | | More progress on pages - extend writepages widget, add pagelist widget | Thomas Willingham | 2013-08-14 | 1 | -4/+5 |
| | | | |||||
* | | | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2013-08-14 | 10 | -457/+593 |
|\| | | |||||
| * | | ru strings updated | friendica | 2013-08-14 | 1 | -154/+158 |
| | | | |||||
| * | | Merge pull request #95 from pixelroot/master | friendica | 2013-08-14 | 1 | -301/+317 |
| |\| | | | | | | | modified: view/ru/messages.po | ||||
| | * | modified: view/ru/messages.po | pixelroot | 2013-08-12 | 1 | -11/+11 |
| | | | |||||
| | * | modified: view/ru/messages.po | pixelroot | 2013-08-12 | 1 | -297/+313 |
| | | | |||||
| * | | primitive cms functionality - provide a custom menu below your profile vcard | friendica | 2013-08-13 | 1 | -0/+3 |
| | | |