aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into tresredmatrix2015-05-171-1/+13
|\
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-171-1/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+10
| | | | | | | | | | | | 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.
| | * preserve htmlhead in case somebody needs itMario Vavti2015-05-151-1/+3
| | |
* | | Merge branch 'master' into tresredmatrix2015-05-141-1/+1
|\| |
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-141-1/+1
| |\|
| | * provide default permissions ('all') for existing and newly created OAuth app ↵redmatrix2015-05-141-1/+1
| | | | | | | | | | | | clients, which will be extended in the future to allow specific permissions.
* | | Merge branch 'master' into tresredmatrix2015-05-141-9/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-131-2/+2
| |\| | | | | | | | | | | | | | | | | | | Conflicts: boot.php include/api.php include/enotify.php
| | * product was a bad string to use because we may require it for e-commerce, ↵redmatrix2015-05-131-2/+2
| | | | | | | | | | | | and RED_PLATFORM is equally problematic for other reasons.
| * | second pass name changeredmatrix2015-05-051-3/+3
| | |
| * | first pass name changeredmatrix2015-05-051-4/+4
| | |
| * | change nameredmatrix2015-05-051-1/+1
| |/
* | Merge branch 'master' into tresfriendica2015-04-231-56/+167
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-03-291-47/+32
| |\
| | * Correcting reported Doxygen syntax warnings.Klaus Weidenbach2015-03-291-47/+32
| | | | | | | | | | | | | | | | | | | | | 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.
| * | fix os_mkdirfriendica2015-03-291-2/+3
| |/
| * add channel_lastpost timestamp to help optimise some outrageously expensive ↵friendica2015-03-261-1/+1
| | | | | | | | queries.
| * reduce the occurrence of duplicated notice() messagesfriendica2015-03-121-5/+8
| |
| * channel delegationfriendica2015-03-101-0/+3
| |
| * straighten out some directory stuff, which required some Comanche structural ↵friendica2015-03-051-2/+20
| | | | | | | | changes
| * add queue priorityfriendica2015-03-041-1/+1
| |
| * login adjustmentMario Vavti2015-03-031-2/+2
| |
| * automated warning after a few days if poller is deadfriendica2015-03-021-0/+43
| |
| * Nag hub admins with self-signed certs to fix them. Otherwise we'll just have ↵friendica2015-03-011-0/+34
| | | | | | | | | | | | to start marking them as dead sites.
| * require access token to view, query, or join directories in private realms, ↵friendica2015-02-241-1/+1
| | | | | | | | if the realm is so configured.
| * Updated doxygen docu about deperecated functions.Klaus Weidenbach2015-02-181-5/+27
| | | | | | | | | | Corrected wrong return types in doxygen docu and add a deprecation log entry.
| * hub upgrade w/name change via Alexfriendica2015-02-161-1/+1
| |
| * Patches from Thomas regarding offline status off whogotzot.comjeroenpraat2015-02-141-1/+0
| |
| * provide relief to sites that are severely impacted by the slow ITEM_UNSEEN ↵friendica2015-02-121-1/+1
| | | | | | | | searches. This does not incorporate any other flag optimisations as that will require a major DB update and possibly involve significant downtime. This is just to bite off a little chunk now and provide some much needed relief.
| * more progress on event confirmationsfriendica2015-02-101-0/+3
| |
* | Merge branch 'master' into tresfriendica2015-02-051-0/+7
|\| | | | | | | | | | | Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css
| * improved directory registration - honour standalones and do the right thingfriendica2015-02-021-0/+7
| |
* | Merge branch 'master' into tresfriendica2015-02-011-1/+14
|\|
| * two tracks proceeding in parallel - first adding the ability to store a ↵friendica2015-02-011-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 tresfriendica2015-01-291-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 ↵friendica2015-01-281-0/+12
| | | | | | | | work in progress should be minor
| * remote_user => remote_channelfriendica2015-01-281-1/+1
| |
| * local_user => local_channelfriendica2015-01-281-8/+8
| |
* | more message restrict conversionsfriendica2015-01-291-4/+9
| |
* | Merge branch 'master' into tresfriendica2015-01-271-1/+1
|\| | | | | | | | | Conflicts: include/socgraph.php
| * provide storage for directory based reputation in the xlink table by setting ↵friendica2015-01-261-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 ↵friendica2015-01-261-3/+4
|\| | | | | | | | | | | | | | | | | | | refactor Conflicts: include/attach.php include/onedirsync.php include/zot.php mod/locs.php
| * Merge branch 'master' of https://github.com/friendica/redmarijus2015-01-221-1/+2
| |\
| | * added redmatrix.nl back as a directory server. this was not the issue with ↵Jeroen2015-01-221-1/+2
| | | | | | | | | | | | the performance problems
| * | change mod/sharedwithme backend to use activity object - this is not ↵marijus2015-01-221-1/+1
| |/ | | | | | | backwards compatible
| * add my.federated.social as directory serverfriendica2015-01-201-0/+1
| |
| * typo in postgres db update, remove redmatrix.nl from directory servers since ↵friendica2015-01-201-1/+0
| | | | | | | | it isn't a directory server any more.
* | more expanding item flagsfriendica2015-01-221-21/+0
| |
* | heavy lifting converting item flag bitsfriendica2015-01-221-11/+11
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 23:04:58 +0000