Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-15 | 6 | -6/+6 | |
|\| | ||||||
| * | also change the update_ scripts | zottel | 2015-07-15 | 3 | -3/+3 | |
| | | ||||||
| * | change sh to bash in shebang to make scripts work | zottel | 2015-07-15 | 3 | -3/+3 | |
| | | ||||||
| * | revision update | redmatrix | 2015-07-10 | 1 | -168/+170 | |
| | | ||||||
* | | more work on db storage of doco | redmatrix | 2015-07-05 | 1 | -0/+33 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-03 | 1 | -97/+616 | |
|\| | | | | | | | | | | | | | Conflicts: boot.php include/items.php util/messages.po | |||||
| * | in hubzilla we're going to convert doco to items. define it here so that an ↵ | redmatrix | 2015-07-03 | 1 | -249/+300 | |
| | | | | | | | | accidental import/export doesn't chuck a wobbly. | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-02 | 1 | -0/+2 | |
|\| | | | | | | | | | Conflicts: include/zot.php | |||||
| * | a few clone sync fixes as well as some work on hubzilla clone sync back to ↵ | redmatrix | 2015-07-02 | 1 | -0/+2 | |
| | | | | | | | | redmatrix | |||||
| * | project updates | redmatrix | 2015-06-26 | 1 | -194/+211 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-21 | 1 | -3/+8 | |
|\| | | | | | | | | | | | Conflicts: include/items.php util/messages.po | |||||
| * | Compatible update for .htaccess. | Klaus Weidenbach | 2015-06-22 | 1 | -3/+8 | |
| | | | | | | | | This should hopefully work in Apache 2.2 and 2.4. | |||||
| * | very early attempt diaspora import from diaspora export file. Currently the ↵ | redmatrix | 2015-06-19 | 1 | -108/+112 | |
| | | | | | | | | json export has to be gunzipped prior to uploading and we're net yet adding connections (which should come soon) and we can't import items until they add guids to the export file - so consider it a work in progress. This first attempt should create a channel and get your profile details setup providing there isn't a nickname conflict on the server. That will also be handled later. | |||||
| * | weekly string update | redmatrix | 2015-06-13 | 1 | -4400/+4581 | |
| | | ||||||
| * | Added translatable strings to the Display Settings page and refreshed ↵ | jeroenpraat | 2015-06-06 | 1 | -4615/+4472 | |
| | | | | | | | | util/messages.po. | |||||
| * | string/version update | redmatrix | 2015-06-06 | 1 | -174/+175 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-31 | 1 | -752/+813 | |
|\| | ||||||
| * | strip images from directory text entries | redmatrix | 2015-05-30 | 1 | -752/+813 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-27 | 1 | -0/+100 | |
|\| | | | | | | | | | Conflicts: mod/impel.php | |||||
| * | add ability to change existing channel/account service class with | Habeas Codice | 2015-05-26 | 1 | -0/+66 | |
| | | | | | | | | | | util/service_class add link from main doc | |||||
| * | Add docs about current service class system, tiny util to make updates a | Habeas Codice | 2015-05-25 | 1 | -0/+34 | |
| | | | | | | | | little easier than the standard config util | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-24 | 1 | -521/+524 | |
|\| | | | | | | | | | | | Conflicts: index.php mod/setup.php | |||||
| * | add local_dir_update hook | redmatrix | 2015-05-23 | 1 | -521/+524 | |
| | | ||||||
* | | 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 | |
| |