Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | new feature: 'suppress_duplicates' issue #146 triggered with less than two ↵ | redmatrix | 2015-11-19 | 1 | -2/+3 |
| | | | | minutes between posts having identical content. | ||||
* | fix admin plugin hooks | redmatrix | 2015-11-17 | 1 | -1/+6 |
| | |||||
* | provide admin setting to change directory server | redmatrix | 2015-11-03 | 1 | -1/+26 |
| | |||||
* | More Bluegrid fine tuning and generic-content-wrapper-styled added to some ↵ | jeroenpraat | 2015-11-01 | 1 | -1/+1 |
| | | | | tpl-files and 2 php files, cause they dont have a tpl file. | ||||
* | move string files to hmessages.po and hstrings.php for hubzilla to avoid ↵ | redmatrix | 2015-09-26 | 1 | -2/+2 |
| | | | | endless merge conflicts. | ||||
* | deliveries per process ui for setting | redmatrix | 2015-09-25 | 1 | -0/+3 |
| | |||||
* | move mod_admin to Comanche finally | redmatrix | 2015-09-08 | 1 | -42/+0 |
| | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-16 | 1 | -7/+7 |
|\ | |||||
| * | issue #386 - account and channel bulk edit checkboxes not visible and ↵ | redmatrix | 2015-08-16 | 1 | -7/+7 |
| | | | | | | | | therefore not useable. Also change wording to remove the offensive 'user' designation. | ||||
* | | more work separating Diaspora from core | redmatrix | 2015-08-03 | 1 | -3/+0 |
| | | |||||
* | | DB changes for some channel flags | redmatrix | 2015-06-15 | 1 | -10/+4 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 1 | -0/+3 |
|\| | |||||
| * | put mirror_frontpage setting into admin/site | redmatrix | 2015-06-09 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 1 | -3/+9 |
|\| | | | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/home.php mod/page.php view/nl/messages.po view/nl/strings.php | ||||
| * | more frontpage tweaks | redmatrix | 2015-06-07 | 1 | -2/+2 |
| | | |||||
| * | reverse logic of homepage login setting | redmatrix | 2015-06-07 | 1 | -3/+6 |
| | | |||||
| * | frontpage tweaks | redmatrix | 2015-06-07 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-25 | 1 | -5/+37 |
|\| | |||||
| * | add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle ↵ | redmatrix | 2015-05-25 | 1 | -5/+37 |
| | | | | | | | | the censor flag from that page. | ||||
* | | Merge branch 'master' into tres | redmatrix | 2015-05-17 | 1 | -1/+1 |
|\ \ | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-17 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | more work isolating the projectname from core. | redmatrix | 2015-05-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | first pass name change | redmatrix | 2015-05-05 | 1 | -2/+2 |
| |/ | |||||
* | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -353/+420 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Correcting reported Doxygen syntax warnings. | Klaus Weidenbach | 2015-03-29 | 1 | -37/+37 |
| | | | | | | | | | | | | | | 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. | ||||
| * | improve description of that setting | friendica | 2015-03-25 | 1 | -1/+1 |
| | | |||||
| * | admin config for default expiration | friendica | 2015-03-25 | 1 | -9/+12 |
| | | |||||
| * | cleanup of old delegation stuff | friendica | 2015-03-10 | 1 | -2/+2 |
| | | |||||
| * | channel delegation | friendica | 2015-03-10 | 1 | -2/+3 |
| | | |||||
| * | more work on queue optimisations | friendica | 2015-03-09 | 1 | -1/+2 |
| | | |||||
| * | Whoops... should've actually checked the pg manual before merging #920 :-) | Habeas Codice | 2015-03-09 | 1 | -2/+2 |
| | | | | | | | | | | replace if(cond,val,val) with case when cond then val else val end, works on both DBs | ||||
| * | Fixing (un)blocking accounts in /admin/users. | Klaus Weidenbach | 2015-03-08 | 1 | -34/+61 |
| | | | | | | | | | | | | When I look at the instructions in sql_conventions about setting bit flags I don't understand how this could have worked before. Changed the behavior for (un)blocking so that it should work now. | ||||
| * | Add alert to admin page about old PHP version. | Klaus Weidenbach | 2015-03-08 | 1 | -296/+282 |
| | | | | | | | | | | | | | | | | | | | | | | | | Add an alert message to admin summary page when a PHP version < 5.4 was detected as this has reached EOL and will not be supported with the new SabreDAV library. Some styleguide optimisation. Add NULL_DATE example to doc/sql_conventions.bb. Display a "0" when no plugins active in summary page. Added some more numbers to summary admin page, expired accounts, channels. Hope I interpreted them right. I have no idea how to get blocked accounts. | ||||
| * | make destructive queue management functions an expert option | friendica | 2015-03-05 | 1 | -1/+4 |
| | | |||||
| * | remove broken sql query from early queue manager. | friendica | 2015-03-04 | 1 | -3/+0 |
| | | |||||
| * | queue management actions. Still needs further work such as indication of ↵ | friendica | 2015-03-01 | 1 | -8/+31 |
| | | | | | | | | last successful connection or indication that the hub was marked offline, but these are potentially expensive queries. | ||||
| * | don't report already delivered queue items in admin queue summary | friendica | 2015-02-26 | 1 | -1/+1 |
| | | |||||
| * | high level queue inspector - needs a lot more, like the ability to dump ↵ | friendica | 2015-02-26 | 1 | -1/+25 |
| | | | | | | | | certain destinations and indicating known dead sites, but this is a start | ||||
| * | solve some (hopefully most) missing delivery issues | friendica | 2015-02-25 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into tres | friendica | 2015-02-01 | 1 | -1/+1 |
|\| | |||||
| * | admin/dbsync not reporting failed updates | friendica | 2015-02-01 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into tres | friendica | 2015-01-31 | 1 | -0/+3 |
|\| | | | | | | | | | Conflicts: include/zot.php | ||||
| * | Add allowed and not allowed emails to the UI in the | Christian Vogeley | 2015-01-29 | 1 | -0/+3 |
| | | | | | | | | admin menu | ||||
* | | Merge branch 'master' into tres | friendica | 2015-01-29 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | local_user => local_channel | friendica | 2015-01-28 | 1 | -1/+1 |
| | | |||||
* | | working through the xchan table to remove bitfields, mostly complete except ↵ | friendica | 2015-01-20 | 1 | -4/+4 |
|/ | | | | for updating the updater | ||||
* | Allow tags in mail, many profile fields, and admin info | Stefan Parviainen | 2015-01-13 | 1 | -0/+2 |
| | |||||
* | don't allow admin to delete the sys channel from the channel manage page | friendica | 2015-01-06 | 1 | -2/+2 |
| | |||||
* | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-13 | 1 | -28/+25 |
|\ | | | | | | | | | | | | | | | | | | | | | | | 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 |