Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix some merge errors | redmatrix | 2015-05-18 | 1 | -1009/+1265 |
| | |||||
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-18 | 1 | -7/+15 |
|\ | |||||
| * | fix po2php to handle projectname variables correctly | redmatrix | 2015-05-18 | 1 | -7/+15 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-17 | 2 | -323/+328 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/bb2diaspora.php include/diaspora.php include/enotify.php mod/admin.php mod/cloud.php mod/dav.php mod/home.php mod/invite.php mod/like.php mod/mitem.php mod/p.php mod/pubsites.php mod/setup.php mod/siteinfo.php util/messages.po | ||||
| * | Implement permission checking for OAuth clients using the xperm table. ↵ | redmatrix | 2015-05-17 | 1 | -1/+1 |
| | | | | | | | | Currently 'all' permissions are applied to OAuth clients which gives them the same rights as the channel owner and full access to API functions as the channel owner. However, individual permissions can now be created. These mirror the permission names from the normal permission table (although it isn't required that they do so). Lack of an xp_perm entry for the specified permission and lack of an 'all' override indicates permission denied. | ||||
| * | new string file - isolating the projectname from translated strings so that ↵ | redmatrix | 2015-05-17 | 1 | -30/+31 |
| | | | | | | | | translation files will work across multiple projects. | ||||
| * | more work isolating the projectname from core. | redmatrix | 2015-05-17 | 1 | -295/+299 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-12 | 3 | -2/+72 |
|\| | |||||
| * | cut/paste error | redmatrix | 2015-05-12 | 1 | -1/+1 |
| | | |||||
| * | repo updaters | redmatrix | 2015-05-12 | 3 | -2/+72 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-10 | 1 | -45/+61 |
|\| | | | | | | | | | | | | | Conflicts: mod/mitem.php view/de/messages.po view/de/strings.php | ||||
| * | rev update | redmatrix | 2015-05-10 | 1 | -45/+61 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-06 | 1 | -200/+209 |
|\| | |||||
| * | turn consensus items into diaspora polls for that network | redmatrix | 2015-05-05 | 1 | -200/+209 |
| | | |||||
* | | second pass name change | redmatrix | 2015-05-05 | 3 | -25/+25 |
| | | |||||
* | | first pass name change | redmatrix | 2015-05-05 | 8 | -34/+34 |
|/ | |||||
* | mod/branchtopic - move an off-topic comment to its own thread as a fresh ↵ | friendica | 2015-04-24 | 1 | -1026/+982 |
| | | | | wall-to-wall post and the same delivery permissions as its parent. No adjustments are made for complex delivery chains. | ||||
* | hide event share button when editing an event | friendica | 2015-04-17 | 1 | -387/+413 |
| | |||||
* | rev update, string update | friendica | 2015-04-11 | 1 | -850/+842 |
| | |||||
* | strings update | friendica | 2015-04-03 | 1 | -1640/+1628 |
| | |||||
* | Correcting reported Doxygen syntax warnings. | Klaus Weidenbach | 2015-03-29 | 1 | -2/+5 |
| | | | | | | | 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. | ||||
* | issue #941 | friendica | 2015-03-28 | 1 | -586/+660 |
| | |||||
* | Extend Doxygen configuration a bit to display more. | Klaus Weidenbach | 2015-03-21 | 1 | -1/+2 |
| | | | | | | | Add view of \license information in Doxygen information and add an overview page for \fixme which is used in source code. We have Bug List, Fixme List, Todo List and Deprecated List. Do we have some other tags we use that we could collect and display? | ||||
* | config to hide version tag from siteinfo - on my site it's meaningless. | friendica | 2015-03-20 | 1 | -366/+385 |
| | |||||
* | update to-do list | friendica | 2015-03-13 | 1 | -3959/+2152 |
| | |||||
* | reverse smilie storage also | friendica | 2015-03-06 | 1 | -593/+2499 |
| | |||||
* | should be -ne | friendica | 2015-03-05 | 2 | -2/+3 |
| | |||||
* | remove Doxygen API Documentation from repository. | Klaus Weidenbach | 2015-03-04 | 1 | -5/+3 |
| | | | | | | | This removes around 14MB and can get easily generate locally by doxygen util/Doxyfile when needed. Restructured .gitignore a bit and some additions like zotshrc, etc. Fixed a typo in doc/main.bb | ||||
* | Fix a couple of places where we weren't checking for dead hublocs. Add a ↵ | friendica | 2015-02-27 | 1 | -2345/+2369 |
| | | | | function to mark a hubloc dead. | ||||
* | provide ability to link new themes/addons | friendica | 2015-02-23 | 4 | -8/+60 |
| | |||||
* | minor issues with arg passing | friendica | 2015-02-20 | 4 | -9/+19 |
| | |||||
* | updated install doc | friendica | 2015-02-20 | 1 | -0/+11 |
| | |||||
* | doc update | friendica | 2015-02-20 | 1 | -389/+445 |
| | |||||
* | git update scripts for external repositories | friendica | 2015-02-19 | 2 | -0/+20 |
| | |||||
* | update the install doc for addons - the procedure is a bit different now ↵ | friendica | 2015-02-19 | 1 | -0/+1 |
| | | | | (although it shouldn't break anything on existing sites.) | ||||
* | Scripts to add external theme and addon repositories. | friendica | 2015-02-19 | 2 | -0/+73 |
| | | | | | | | | | Example: util/add_theme_repo https://github.com/deadsuperhero/redmatrix-themes deadsuperhero The final argument is a nickname on this system. The repository will be placed under extend/theme/deadsuperhero and the themes from that repository linked to your redmatrix theme directory. You can do the same with addons. We'll have to come up with some "pull" scripts to keep updated but the clever folks will already know how to do this. | ||||
* | add zotsh to util | friendica | 2015-02-15 | 9 | -0/+646 |
| | |||||
* | missing param | friendica | 2015-02-13 | 1 | -3604/+3750 |
| | |||||
* | get_rel_link broken - also weekly doc updates | friendica | 2015-02-06 | 1 | -1243/+1277 |
| | |||||
* | let zot_refresh continue without a primary hub if one cannot be found. also ↵ | friendica | 2015-01-30 | 1 | -3303/+3324 |
| | | | | weekly doc updates | ||||
* | local_user => local_channel | friendica | 2015-01-28 | 1 | -4/+4 |
| | |||||
* | doc updates | friendica | 2015-01-23 | 1 | -875/+897 |
| | |||||
* | make typo.php descend into include/RedDAV | friendica | 2015-01-18 | 1 | -0/+8 |
| | |||||
* | mod_prep usability enhancements, doc updates | friendica | 2015-01-16 | 1 | -2618/+2660 |
| | |||||
* | doc updates | friendica | 2015-01-10 | 1 | -840/+864 |
| | |||||
* | doc updates | friendica | 2015-01-02 | 1 | -1960/+1971 |
| | |||||
* | Don't trim escaped quotes | Erik Lundin | 2014-12-29 | 1 | -5/+13 |
| | |||||
* | doc update | friendica | 2014-12-26 | 1 | -270/+286 |
| | |||||
* | doc updates | friendica | 2014-12-19 | 1 | -2989/+2995 |
| | |||||
* | don't import to sys channel from self-censored authors | friendica | 2014-12-12 | 1 | -807/+820 |
| |