Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -217/+305 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css | |||||
| * | api - unobscure mail | friendica | 2015-04-19 | 1 | -0/+11 | |
| | | ||||||
| * | dont suggest anything here it explains itself | Mario Vavti | 2015-04-14 | 1 | -1/+1 | |
| | | ||||||
| * | some more on webpages | Mario Vavti | 2015-04-14 | 1 | -12/+15 | |
| | | ||||||
| * | move style to style.css | Mario Vavti | 2015-04-10 | 1 | -3/+3 | |
| | | ||||||
| * | make r# work better with different font sizes | Mario Vavti | 2015-04-10 | 1 | -3/+3 | |
| | | ||||||
| * | that didn't work out well - let's do this instead | friendica | 2015-04-08 | 1 | -27/+16 | |
| | | ||||||
| * | fix selector when sys channel active | friendica | 2015-04-08 | 1 | -0/+13 | |
| | | ||||||
| * | system channel always has allow_code privileges | friendica | 2015-04-08 | 1 | -6/+19 | |
| | | ||||||
| * | Fix Design Tool navigation for sys channel. | Klaus Weidenbach | 2015-04-06 | 1 | -6/+16 | |
| | | | | | | | | Fix creating menu for sys channel. | |||||
| * | Correcting reported Doxygen syntax warnings. | Klaus Weidenbach | 2015-03-29 | 1 | -149/+182 | |
| | | | | | | | | | | | | | | Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation. | |||||
| * | comanche: move 'webpage' declaration to the first parser pass so it is set ↵ | friendica | 2015-03-25 | 1 | -2/+2 | |
| | | | | | | | | when content loads. | |||||
| * | catche edge case of tag "@abcdef +1", which tags the first entry in your ↵ | friendica | 2015-03-24 | 1 | -6/+15 | |
| | | | | | | | | abook, regardless of abcdef. This holds true for other similar patterns as well. | |||||
| * | improve performance of the zotfeed queries | friendica | 2015-03-23 | 1 | -3/+7 | |
| | | ||||||
| * | add loadtime search to channel and fix it for home. display and search need ↵ | friendica | 2015-03-21 | 1 | -2/+1 | |
| | | | | | | | | further investigation | |||||
| * | make the channel item query match recent changes to network item query (and ↵ | friendica | 2015-03-18 | 1 | -1/+1 | |
| | | | | | | | | some slightly older changes in display item query), and allow '@' in linkified urls. | |||||
| * | openid cleanup | friendica | 2015-03-16 | 1 | -7/+5 | |
| | | ||||||
| * | Some cleanups. | Klaus Weidenbach | 2015-03-13 | 1 | -13/+16 | |
| | | | | | | | | | | | | Fixed dbesc_identifier(), but it is not used yet. Corrected some other variable names and variable initialization before using them. | |||||
| * | support rel=me on channel "homepage" url | friendica | 2015-02-24 | 1 | -2/+2 | |
| | | ||||||
| * | issue #896 | friendica | 2015-02-12 | 1 | -2/+4 | |
| | | ||||||
* | | Merge branch 'master' into tres | friendica | 2015-02-08 | 1 | -1/+1 | |
|\| | | | | | | | | | | | Conflicts: mod/events.php view/css/mod_events.css | |||||
| * | get_rel_link broken - also weekly doc updates | friendica | 2015-02-06 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' into tres | friendica | 2015-02-05 | 1 | -2/+5 | |
|\| | | | | | | | | | | | Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css | |||||
| * | garbage in garbage out | friendica | 2015-02-03 | 1 | -2/+2 | |
| | | ||||||
| * | issue #889 private tags for forums no longer recognised after tag refactor a ↵ | friendica | 2015-02-02 | 1 | -0/+3 | |
| | | | | | | | | few weeks back. This solution is not optimal as it also leaves you in the privacy ACL in some cases and not in others but it restores the previous functionality | |||||
* | | Merge branch 'master' into tres | friendica | 2015-02-01 | 1 | -0/+1 | |
|\| | ||||||
| * | add multipart/mixed to getIconFromType() | marijus | 2015-02-01 | 1 | -0/+1 | |
| | | ||||||
* | | Merge branch 'master' into tres | friendica | 2015-01-29 | 1 | -10/+10 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php | |||||
| * | local_user => local_channel | friendica | 2015-01-28 | 1 | -10/+10 | |
| | | ||||||
* | | more message restrict conversions | friendica | 2015-01-29 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'master' into tres | friendica | 2015-01-27 | 1 | -0/+71 | |
|\| | | | | | | | | | Conflicts: include/socgraph.php | |||||
| * | move userReadableSize() and getIconFromType() from ↵ | marijus | 2015-01-27 | 1 | -0/+71 | |
| | | | | | | | | /include/RedDAV/RedBrowser.php to include/text.php and add template for mod/sharedwithme | |||||
* | | Merge branch 'master' into tres and add some work on the item_deleted flag ↵ | friendica | 2015-01-26 | 1 | -1/+2 | |
|\| | | | | | | | | | | | | | | | | | | | refactor Conflicts: include/attach.php include/onedirsync.php include/zot.php mod/locs.php | |||||
| * | Call sslify with an extra path element so files keep their names | Alexandre Hannud Abdo | 2015-01-25 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | The main motivation for this is when saving images one doesn't need to inspect and manually input the file's actual name. There might be other benefits, perhaps in automated downloads. | |||||
* | | more expanding item flags | friendica | 2015-01-22 | 1 | -1/+1 | |
| | | ||||||
* | | working through the xchan table to remove bitfields, mostly complete except ↵ | friendica | 2015-01-20 | 1 | -7/+6 | |
| | | | | | | | | for updating the updater | |||||
* | | that should take care of the bitfields in hubloc | friendica | 2015-01-20 | 1 | -3/+3 | |
|/ | ||||||
* | Fix some issues with tagging. | Stefan Parviainen | 2015-01-16 | 1 | -16/+13 | |
| | ||||||
* | ignore bbcode open tag (left bracket) in hash and mention tag regexes and ↵ | friendica | 2015-01-14 | 1 | -2/+2 | |
| | | | | turn it into a tag delimiter | |||||
* | provide a setting to control ALLOWCODE permissions at the channel level - it ↵ | friendica | 2015-01-13 | 1 | -4/+4 | |
| | | | | isn't always appropriate to apply this to all channels in an account. | |||||
* | Allow tags in mail, many profile fields, and admin info | Stefan Parviainen | 2015-01-13 | 1 | -1/+1 | |
| | ||||||
* | Refactor mention code to make it more reusable | Stefan Parviainen | 2015-01-12 | 1 | -0/+30 | |
| | ||||||
* | include channel clones in PM deliveries (also some whitespace edits) | friendica | 2015-01-08 | 1 | -15/+15 | |
| | ||||||
* | lines reversed in handle_tag() | friendica | 2015-01-06 | 1 | -2/+2 | |
| | ||||||
* | Revert "Revert "Language names via intl library."" | Stefan Parviainen | 2014-12-31 | 1 | -1/+1 | |
| | | | | This reverts commit 4f35efa0bad4ae6489b63f3eebafe6542d654094. | |||||
* | Revert "Language names via intl library." | RedMatrix | 2014-12-31 | 1 | -1/+1 | |
| | ||||||
* | Language names via intl library. Fixes #773 | Stefan Parviainen | 2014-12-30 | 1 | -1/+1 | |
| | ||||||
* | fix double encoding of homepage in profile activity - not as ↵ | friendica | 2014-12-21 | 1 | -0/+1 | |
| | | | | straight-forward as it looked | |||||
* | Access list of smilies over JSON | Stefan Parviainen | 2014-12-20 | 1 | -31/+38 | |
| | ||||||
* | allow a variety of latitude/longitude delimiters since nobody can agree on them. | friendica | 2014-12-17 | 1 | -1/+3 | |
| |