Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into tres | friendica | 2015-02-05 | 1 | -0/+7 |
|\ | | | | | | | | | | | Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css | ||||
| * | improved directory registration - honour standalones and do the right thing | friendica | 2015-02-02 | 1 | -0/+7 |
| | | |||||
* | | Merge branch 'master' into tres | friendica | 2015-02-01 | 1 | -1/+14 |
|\| | |||||
| * | two tracks proceeding in parallel - first adding the ability to store a ↵ | friendica | 2015-02-01 | 1 | -1/+14 |
| | | | | | | | | digital signature with ratings so that directories can pass them around, second provide some directory registration functions so we can obtain a list of directories from somewhere (to pass ratings around between them). This gives the primary directory role some value as that is where you register your directory. | ||||
* | | Merge branch 'master' into tres | friendica | 2015-01-29 | 1 | -9/+21 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | provide compatibility functions so code breakage with customised setups or ↵ | friendica | 2015-01-28 | 1 | -0/+12 |
| | | | | | | | | work in progress should be minor | ||||
| * | remote_user => remote_channel | friendica | 2015-01-28 | 1 | -1/+1 |
| | | |||||
| * | local_user => local_channel | friendica | 2015-01-28 | 1 | -8/+8 |
| | | |||||
* | | more message restrict conversions | friendica | 2015-01-29 | 1 | -4/+9 |
| | | |||||
* | | Merge branch 'master' into tres | friendica | 2015-01-27 | 1 | -1/+1 |
|\| | | | | | | | | | Conflicts: include/socgraph.php | ||||
| * | provide storage for directory based reputation in the xlink table by setting ↵ | friendica | 2015-01-26 | 1 | -1/+1 |
| | | | | | | | | xlink_static = 1, so that xlink_static = 0 is traditional poco linkages | ||||
* | | Merge branch 'master' into tres and add some work on the item_deleted flag ↵ | friendica | 2015-01-26 | 1 | -3/+4 |
|\| | | | | | | | | | | | | | | | | | | | refactor Conflicts: include/attach.php include/onedirsync.php include/zot.php mod/locs.php | ||||
| * | Merge branch 'master' of https://github.com/friendica/red | marijus | 2015-01-22 | 1 | -1/+2 |
| |\ | |||||
| | * | added redmatrix.nl back as a directory server. this was not the issue with ↵ | Jeroen | 2015-01-22 | 1 | -1/+2 |
| | | | | | | | | | | | | the performance problems | ||||
| * | | change mod/sharedwithme backend to use activity object - this is not ↵ | marijus | 2015-01-22 | 1 | -1/+1 |
| |/ | | | | | | | backwards compatible | ||||
| * | add my.federated.social as directory server | friendica | 2015-01-20 | 1 | -0/+1 |
| | | |||||
| * | typo in postgres db update, remove redmatrix.nl from directory servers since ↵ | friendica | 2015-01-20 | 1 | -1/+0 |
| | | | | | | | | it isn't a directory server any more. | ||||
* | | more expanding item flags | friendica | 2015-01-22 | 1 | -21/+0 |
| | | |||||
* | | heavy lifting converting item flag bits | friendica | 2015-01-22 | 1 | -11/+11 |
| | | |||||
* | | slow progress removing bitfields on item table | friendica | 2015-01-21 | 1 | -1/+1 |
| | | |||||
* | | working through the xchan table to remove bitfields, mostly complete except ↵ | friendica | 2015-01-20 | 1 | -30/+0 |
|/ | | | | for updating the updater | ||||
* | oauth permissions table | friendica | 2015-01-19 | 1 | -1/+1 |
| | |||||
* | fix update 1131 for postgres databases | Habeas Codice | 2015-01-18 | 1 | -1/+1 |
| | |||||
* | more backend work on poco rating | friendica | 2015-01-15 | 1 | -1/+1 |
| | |||||
* | some back-end code to support location activity objects. Work in progress. | friendica | 2015-01-14 | 1 | -0/+1 |
| | |||||
* | federate consensus items (in network only). Work in progress. | friendica | 2015-01-14 | 1 | -1/+1 |
| | |||||
* | provide a setting to control ALLOWCODE permissions at the channel level - it ↵ | friendica | 2015-01-13 | 1 | -1/+1 |
| | | | | isn't always appropriate to apply this to all channels in an account. | ||||
* | basic backend work for creating consensus items | friendica | 2015-01-11 | 1 | -0/+4 |
| | |||||
* | basic changes for file activity | marijus | 2015-01-09 | 1 | -0/+1 |
| | |||||
* | syncing connections issue, incorrect return_url after deleting connection | friendica | 2015-01-07 | 1 | -1/+1 |
| | |||||
* | don't allow admin to delete the sys channel from the channel manage page | friendica | 2015-01-06 | 1 | -1/+1 |
| | |||||
* | Sorting of autocomplete | Stefan Parviainen | 2015-01-04 | 1 | -0/+16 |
|\ | |||||
| * | no newline at end of file | friendica | 2015-01-02 | 1 | -1/+1 |
| | | |||||
| * | syntax issues (with some php versions?), unchecked intval | friendica | 2015-01-01 | 1 | -0/+16 |
| | | |||||
* | | Autocmplete suggestions for non-local users, also suggest from visited ↵ | Stefan Parviainen | 2015-01-04 | 1 | -0/+1 |
|/ | | | | channel's connections | ||||
* | filter posts you author from unseen notifications - note there are other ↵ | friendica | 2014-12-28 | 1 | -0/+2 |
| | | | | ways to do this, but involve some code complexity. This is easier to implement but may have a slight impact on the ping query performance. It's not horrid, just mentioning for the record. | ||||
* | doc update | friendica | 2014-12-26 | 1 | -1/+1 |
| | |||||
* | provide last successful poll run time (using relative time) in siteinfo so ↵ | friendica | 2014-12-21 | 1 | -0/+10 |
| | | | | that we can tell folks that have no idea what we're talking about that their poller definitely isn't running and this is probably why nothing works correctly. | ||||
* | Add security logger to RedDAV. | Klaus Weidenbach | 2014-12-14 | 1 | -1/+10 |
| | | | | Some smaller clean ups whitepsaces and tabs, use PHP_EOL, Doxygen, etc. | ||||
* | Fix WSOD on login | Thomas Willingham | 2014-12-12 | 1 | -3/+5 |
| | |||||
* | Some Doxygen comments and small cleanups. | Klaus Weidenbach | 2014-12-07 | 1 | -50/+138 |
| | |||||
* | Put dir back - the fat lady didn't sing afterall. | Thomas Willingham | 2014-12-04 | 1 | -1/+2 |
| | |||||
* | Update dir fallbacks. | Thomas Willingham | 2014-11-25 | 1 | -1/+0 |
| | |||||
* | some poller optimisations and a fix for undefined (empty) dbtype which shows ↵ | friendica | 2014-11-16 | 1 | -1/+2 |
| | | | | up as a mysql error that 'rand' isn't found. | ||||
* | Merge pull request #691 from dawnbreak/master | RedMatrix | 2014-11-14 | 1 | -19/+24 |
|\ | | | | | Changed two strange looking places in boot.php. | ||||
| * | Fixed a variable conflict in mod/xchan.php. | Klaus Weidenbach | 2014-11-14 | 1 | -1/+1 |
| | | | | | | | | | | A variable $rr inside the foreachs was used twice. Add translation to mod/xchan.php. | ||||
| * | Changed two strange looking places in boot.php. | Klaus Weidenbach | 2014-11-13 | 1 | -19/+24 |
| | | | | | | | | | | There have been two places that looked wrong, but I don't know how I can test them. So please review and test if I am not wrong. | ||||
* | | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-13 | 1 | -169/+186 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: boot.php include/dba/dba_driver.php include/diaspora.php include/follow.php include/session.php include/zot.php mod/photos.php mod/ping.php | ||||
| * | Some Doxygen documentation. | Klaus Weidenbach | 2014-11-13 | 1 | -162/+162 |
| | | | | | | | | | | Add some more Doxygen formating for boot.php and dba_driver.php. Cleaning a bit up, too. | ||||
| * | slow progress on sys publishing, making sure all the data we need is in the ↵ | friendica | 2014-11-11 | 1 | -2/+2 |
| | | | | | | | | places we need it but validate it anyway |