aboutsummaryrefslogtreecommitdiffstats
path: root/util
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-092-334/+337
|\ | | | | | | | | | | Conflicts: mod/uexport.php view/tpl/uexport.tpl
| * string updateredmatrix2015-10-091-2/+2
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-041-5/+5
|\|
| * version and strings updateredmatrix2015-10-041-5/+5
| |
* | string updateredmatrix2015-10-021-381/+399
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-271-2758/+2290
|\| | | | | | | | | | | Conflicts: include/zot.php util/messages.po
| * add some safety checks on the sending side of syncredmatrix2015-09-271-23/+23
| |
| * dummy updateredmatrix2015-09-181-5/+5
| |
| * another tactic to deal with orphan hublocs from re-installs, or at least ↵redmatrix2015-09-111-184/+184
| | | | | | | | allow the descendant channel to survive
| * PRIVACY: item_private seems to have been removed from permissions_sql ↵redmatrix2015-09-071-179/+179
| | | | | | | | checking with an observer.
| * change the likes db structure to make it more easily importable/exportableredmatrix2015-08-311-253/+253
| |
| * issues with abook sync between hubzilla and redredmatrix2015-08-231-83/+88
| |
| * set email verified if lost password workflow is completed to avoid the ↵redmatrix2015-08-141-33/+33
| | | | | | | | situation where they can reset the password but still not be able to login because the original email verification was lost.
| * ensure diaspora_signature is converted to json before we store it.redmatrix2015-08-081-10/+14
| |
| * consistency of event formredmatrix2015-07-311-210/+195
| |
| * revision and string updateredmatrix2015-07-261-29/+33
| |
| * string updateredmatrix2015-07-191-985/+925
| |
* | move string files to hmessages.po and hstrings.php for hubzilla to avoid ↵redmatrix2015-09-266-8/+11298
| | | | | | | | endless merge conflicts.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-156-6/+6
|\|
| * also change the update_ scriptszottel2015-07-153-3/+3
| |
| * change sh to bash in shebang to make scripts workzottel2015-07-153-3/+3
| |
| * revision updateredmatrix2015-07-101-168/+170
| |
* | more work on db storage of docoredmatrix2015-07-051-0/+33
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-031-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 ↵redmatrix2015-07-031-249/+300
| | | | | | | | accidental import/export doesn't chuck a wobbly.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-021-0/+2
|\| | | | | | | | | Conflicts: include/zot.php
| * a few clone sync fixes as well as some work on hubzilla clone sync back to ↵redmatrix2015-07-021-0/+2
| | | | | | | | redmatrix
| * project updatesredmatrix2015-06-261-194/+211
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-211-3/+8
|\| | | | | | | | | | | Conflicts: include/items.php util/messages.po
| * Compatible update for .htaccess.Klaus Weidenbach2015-06-221-3/+8
| | | | | | | | This should hopefully work in Apache 2.2 and 2.4.
| * very early attempt diaspora import from diaspora export file. Currently the ↵redmatrix2015-06-191-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 updateredmatrix2015-06-131-4400/+4581
| |
| * Added translatable strings to the Display Settings page and refreshed ↵jeroenpraat2015-06-061-4615/+4472
| | | | | | | | util/messages.po.
| * string/version updateredmatrix2015-06-061-174/+175
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-311-752/+813
|\|
| * strip images from directory text entriesredmatrix2015-05-301-752/+813
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-271-0/+100
|\| | | | | | | | | Conflicts: mod/impel.php
| * add ability to change existing channel/account service class withHabeas Codice2015-05-261-0/+66
| | | | | | | | | | util/service_class add link from main doc
| * Add docs about current service class system, tiny util to make updates aHabeas Codice2015-05-251-0/+34
| | | | | | | | little easier than the standard config util
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-241-521/+524
|\| | | | | | | | | | | Conflicts: index.php mod/setup.php
| * add local_dir_update hookredmatrix2015-05-231-521/+524
| |
* | fix some merge errorsredmatrix2015-05-181-1009/+1265
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-181-7/+15
|\|
| * fix po2php to handle projectname variables correctlyredmatrix2015-05-181-7/+15
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-172-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. ↵redmatrix2015-05-171-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 ↵redmatrix2015-05-171-30/+31
| | | | | | | | translation files will work across multiple projects.
| * more work isolating the projectname from core.redmatrix2015-05-171-295/+299
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-123-2/+72
|\|
| * cut/paste errorredmatrix2015-05-121-1/+1
| |