aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Upstream mergeChristian Vogeley2013-09-159-1310/+1640
|\
| * Merge https://github.com/friendica/red into zpullfriendica2013-09-141-1303/+1611
| |\
| | * Merge pull request #132 from pixelroot/masterOlaf Conradi2013-09-141-1303/+1611
| | |\ | | | | | | | | modified: view/ru/messages.po
| | | * modified: view/ru/messages.popixelroot2013-09-131-1303/+1611
| | | |
| * | | this might fix "find channels" but I can't test the keyword search until ↵friendica2013-09-141-1/+1
| |/ / | | | | | | | | | this is running on a production site.
| * | Admin templates.Thomas Willingham2013-09-106-6/+6
| | |
| * | Quick and dirty file storage module.Thomas Willingham2013-09-091-0/+22
| | |
* | | Search by dateChristian Vogeley2013-09-151-1/+1
|/ / | | | | | | Search by date (archive) works a bit now
* | Merge service classChristian Vogeley2013-09-083-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 classChristian Vogeley2013-09-083-1/+9
| | | | | | | | | | | | identity, follow, photo upload, att upload
* | | More content wrappers.Thomas Willingham2013-09-086-2/+12
| | |
* | | filter by category fixesMichael Johnston2013-09-061-1/+1
| | |
* | | Fix new menu link.Thomas Willingham2013-09-061-1/+1
| | |
* | | Redbasic - optimise mail list.Thomas Willingham2013-09-062-28/+11
| | |
* | | Redbasic - some more CSS we don't use.Thomas Willingham2013-09-061-181/+3
| | |
* | | Redbasic - clean up nav.Thomas Willingham2013-09-062-64/+5
| | |
* | | make displaying the language selector configurablefriendica2013-09-031-1/+1
| | |
* | | fix mod/search_ac (sort of)friendica2013-09-021-1/+1
| | |
* | | add a layout selectorfriendica2013-09-021-0/+1
| | |
* | | Merge pull request #109 from tuscanhobbit/masterThomas Willingham2013-09-022-1258/+1322
|\ \ \ | | | | | | | | complete and updated Italian translation
| * | | complete and updated Italian translationtuscanhobbit2013-09-022-1258/+1322
| | | |
* | | | webpage content-type -- needs cleaning up and a security check once all the ↵friendica2013-09-021-0/+3
| |/ / |/| | | | | | | | important bits are in place.
* | | silence some warnings at php E_ALL levelsfriendica2013-08-281-5/+1
| | |
* | | bring back mail list and cleanup some issues which popped out with full PHP ↵friendica2013-08-271-1/+1
| | | | | | | | | | | | warnings
* | | Preparatory work for photo conversations (third time). Also take away unused ↵friendica2013-08-272-3/+6
| | | | | | | | | | | | "post new activity" preferences until they actually do something.
* | | get rid of ssl_policy - it's implicit in the site urlfriendica2013-08-271-4/+4
| | |
* | | TypoThomas Willingham2013-08-241-1/+1
| | |
* | | Another one.Thomas Willingham2013-08-241-0/+2
| | |
* | | Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-08-2414-8961/+6322
|\ \ \
| * | | Make footers position fixed, so that its content appearsChristian Vogeley2013-08-241-0/+2
| | | |
| * | | premium/restricted channel connections implemented, configure at ↵friendica2013-08-212-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 ↵friendica2013-08-213-0/+15
| |/ / | | | | | | | | | buttons and editing has not been completed
| * | Merge pull request #101 from tuscanhobbit/masterfriendica2013-08-202-8956/+6225
| |\ \ | | | | | | | | Italian translation (Thanks!)
| | * | First version of Italian translationp.tacconi2013-08-202-5/+5
| | | |
| | * | First version of Italian translationp.tacconi2013-08-202-8954/+6223
| | | |
| * | | email attachments (and fix email photos)friendica2013-08-193-3/+33
| | | |
| * | | if changing primary hub during an import operation - remove the old xchan ↵friendica2013-08-191-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 updatefriendica2013-08-171-0/+1
| | |
| * | fix import from filefriendica2013-08-151-1/+1
| | |
| * | move js from matrix pagefriendica2013-08-151-0/+9
| | |
| * | Merge pull request #96 from beardy-unixer/masterfriendica2013-08-142-4/+8
| |\ \ | | | | | | | | Webpages
| * | | most of expire is now ported from friendica, but the protocol bits to push ↵friendica2013-08-141-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 easierThomas Willingham2013-08-246-14/+20
| |/ / |/| |
* | | More progress on pages - extend writepages widget, add pagelist widgetThomas Willingham2013-08-141-4/+5
| | |
* | | Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-08-1410-457/+593
|\| |
| * | ru strings updatedfriendica2013-08-141-154/+158
| | |
| * | Merge pull request #95 from pixelroot/masterfriendica2013-08-141-301/+317
| |\| | | | | | | modified: view/ru/messages.po
| | * modified: view/ru/messages.popixelroot2013-08-121-11/+11
| | |
| | * modified: view/ru/messages.popixelroot2013-08-121-297/+313
| | |
| * | primitive cms functionality - provide a custom menu below your profile vcardfriendica2013-08-131-0/+3
| | |