Commit graph

575 commits

Author SHA1 Message Date
jeroenpraat
e98c871781 Regenerated messages.po. 2015-10-14 14:31:51 +02:00
redmatrix
d076255c98 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	mod/uexport.php
	view/tpl/uexport.tpl
2015-10-09 14:27:47 -07:00
redmatrix
b31aa4aacb string update 2015-10-09 14:25:29 -07:00
redmatrix
95d6d2644f Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-10-04 13:49:13 -07:00
redmatrix
dbd981939c version and strings update 2015-10-04 13:48:06 -07:00
redmatrix
b1e0018b74 string update 2015-10-02 04:50:58 -07:00
redmatrix
55b530f0fd Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/zot.php
	util/messages.po
2015-09-27 17:00:41 -07:00
redmatrix
aae51a9b23 add some safety checks on the sending side of sync 2015-09-27 16:47:25 -07:00
redmatrix
cd2b811555 move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts. 2015-09-26 23:44:30 -07:00
redmatrix
3dc066a143 dummy update 2015-09-18 22:43:35 -07:00
redmatrix
e062c4e6b5 another tactic to deal with orphan hublocs from re-installs, or at least allow the descendant channel to survive 2015-09-11 14:30:07 -07:00
redmatrix
1b09c64856 PRIVACY: item_private seems to have been removed from permissions_sql checking with an observer. 2015-09-07 03:59:38 -07:00
redmatrix
d7cf7316be change the likes db structure to make it more easily importable/exportable 2015-08-31 20:55:25 -07:00
redmatrix
b1f091e4d7 issues with abook sync between hubzilla and red 2015-08-23 17:40:47 -07:00
redmatrix
0d84c77c6c set email verified if lost password workflow is completed to avoid the situation where they can reset the password but still not be able to login because the original email verification was lost. 2015-08-14 22:19:15 -07:00
redmatrix
2656aeaf9c ensure diaspora_signature is converted to json before we store it. 2015-08-08 15:18:34 -07:00
redmatrix
5e985ef34f consistency of event form 2015-07-31 15:42:52 -07:00
redmatrix
4b96b76f5c revision and string update 2015-07-26 16:42:36 -07:00
redmatrix
736db4992b string update 2015-07-19 13:20:04 -07:00
redmatrix
6046fe9c9e Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-15 17:50:24 -07:00
zottel
ba7acf88ad also change the update_ scripts 2015-07-15 15:40:23 +02:00
zottel
f4a1ca0692 change sh to bash in shebang to make scripts work 2015-07-15 15:29:08 +02:00
redmatrix
ae6541cf74 revision update 2015-07-10 14:20:08 -07:00
redmatrix
f20933e1e0 more work on db storage of doco 2015-07-05 19:52:41 -07:00
redmatrix
a74631b554 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	boot.php
	include/items.php
	util/messages.po
2015-07-03 15:03:56 -07:00
redmatrix
0b9332fde9 in hubzilla we're going to convert doco to items. define it here so that an accidental import/export doesn't chuck a wobbly. 2015-07-03 14:30:42 -07:00
redmatrix
90a31f4ad5 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	include/zot.php
2015-07-02 22:00:15 -07:00
redmatrix
065a50c920 a few clone sync fixes as well as some work on hubzilla clone sync back to redmatrix 2015-07-02 21:55:36 -07:00
redmatrix
002be8f9ce project updates 2015-06-26 16:37:55 -07:00
redmatrix
ae6612025d Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	include/items.php
	util/messages.po
2015-06-21 20:51:07 -07:00
Klaus Weidenbach
c3fa0a3ca7 Compatible update for .htaccess.
This should hopefully work in Apache 2.2 and 2.4.
2015-06-22 00:45:29 +02:00
redmatrix
6bd90816dd very early attempt diaspora import from diaspora export file. Currently the 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. 2015-06-19 16:39:03 -07:00
redmatrix
d01fbe521f weekly string update 2015-06-13 15:00:22 -07:00
jeroenpraat
93237f8d0a Added translatable strings to the Display Settings page and refreshed util/messages.po. 2015-06-06 19:49:30 +02:00
redmatrix
b832444dc2 string/version update 2015-06-06 00:06:26 -07:00
redmatrix
f3b95f591a Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-31 19:26:00 -07:00
redmatrix
edd228decb strip images from directory text entries 2015-05-30 15:03:44 -07:00
redmatrix
b381ec5734 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	mod/impel.php
2015-05-27 19:27:38 -07:00
Habeas Codice
bd25f8577f add ability to change existing channel/account service class with
util/service_class
add link from main doc
2015-05-26 00:21:08 -07:00
Habeas Codice
f7731d7e8f Add docs about current service class system, tiny util to make updates a
little easier than the standard config util
2015-05-25 22:40:04 -07:00
redmatrix
851f2f64df Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	index.php
	mod/setup.php
2015-05-24 15:50:05 -07:00
redmatrix
ee14657863 add local_dir_update hook 2015-05-23 15:07:24 -07:00
redmatrix
4c319a98a8 fix some merge errors 2015-05-18 17:20:59 -07:00
redmatrix
71a2f2d773 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-18 17:00:04 -07:00
redmatrix
0340639cb1 fix po2php to handle projectname variables correctly 2015-05-18 16:30:00 -07:00
redmatrix
76558df966 Merge branch 'master' of https://github.com/redmatrix/redmatrix
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
2015-05-17 19:48:57 -07:00
redmatrix
3b859aa9ef Implement permission checking for OAuth clients using the xperm table. 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. 2015-05-17 18:14:50 -07:00
redmatrix
9a67ec8bd4 new string file - isolating the projectname from translated strings so that translation files will work across multiple projects. 2015-05-17 16:33:43 -07:00
redmatrix
91d7b0f7eb more work isolating the projectname from core. 2015-05-17 16:28:16 -07:00
redmatrix
4ca06ebd79 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-12 21:57:06 -07:00
redmatrix
19a2bdeb91 cut/paste error 2015-05-12 21:40:49 -07:00
redmatrix
a67ada15f3 repo updaters 2015-05-12 21:35:30 -07:00
redmatrix
0a644a2f41 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	mod/mitem.php
	view/de/messages.po
	view/de/strings.php
2015-05-10 13:26:44 -07:00
redmatrix
3140650b8f rev update 2015-05-10 13:17:41 -07:00
redmatrix
75b8bfc07a Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-06 18:39:12 -07:00
redmatrix
f559c91b7a turn consensus items into diaspora polls for that network 2015-05-05 19:23:21 -07:00
redmatrix
5b5f0666f9 second pass name change 2015-05-05 03:59:51 -07:00
redmatrix
a3c37f1458 first pass name change 2015-05-05 03:56:10 -07:00
friendica
b3ac1cd993 mod/branchtopic - move an off-topic comment to its own thread as a fresh wall-to-wall post and the same delivery permissions as its parent. No adjustments are made for complex delivery chains. 2015-04-24 00:56:06 -07:00
friendica
3d99a6b5c4 hide event share button when editing an event 2015-04-17 17:20:24 -07:00
friendica
e64de798b5 rev update, string update 2015-04-11 00:34:39 -07:00
friendica
f18621c6db strings update 2015-04-03 17:14:09 -07:00
Klaus Weidenbach
d0361582b0 Correcting reported Doxygen syntax warnings.
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.
2015-03-29 22:23:00 +02:00
friendica
0aba609ad4 issue #941 2015-03-28 14:53:00 -07:00
Klaus Weidenbach
91f7da6f01 Extend Doxygen configuration a bit to display more.
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?
2015-03-21 01:56:20 +01:00
friendica
01716dea3d config to hide version tag from siteinfo - on my site it's meaningless. 2015-03-20 16:46:07 -07:00
friendica
ce33eca4b2 update to-do list 2015-03-13 01:22:32 -07:00
friendica
73891dc582 reverse smilie storage also 2015-03-06 03:04:04 -08:00
friendica
9bbf509ede should be -ne 2015-03-05 15:07:05 -08:00
Klaus Weidenbach
da6eecd031 remove Doxygen API Documentation from repository.
This removes around 14MB and can get easily generate locally by
doxygen util/Doxyfile when needed.
Restructured .gitignore a bit and some additions like zotshrc, etc.
Fixed a typo in doc/main.bb
2015-03-04 11:38:35 +01:00
friendica
2b44c5fc72 Fix a couple of places where we weren't checking for dead hublocs. Add a function to mark a hubloc dead. 2015-02-27 13:43:12 -08:00
friendica
2264ad5c6e provide ability to link new themes/addons 2015-02-23 19:10:34 -08:00
friendica
835b259455 minor issues with arg passing 2015-02-20 14:07:24 -08:00
friendica
8eedc9d576 updated install doc 2015-02-20 13:18:44 -08:00
friendica
ccf1a131f1 doc update 2015-02-20 00:15:03 -08:00
friendica
7926ed079a git update scripts for external repositories 2015-02-19 21:11:02 -08:00
friendica
eeec826eda update the install doc for addons - the procedure is a bit different now (although it shouldn't break anything on existing sites.) 2015-02-19 20:53:24 -08:00
friendica
436a82d74e Scripts to add external theme and addon repositories.
Example:
    util/add_theme_repo https://github.com/deadsuperhero/redmatrix-themes deadsuperhero

The final argument is a nickname on this system. The repository will be placed under extend/theme/deadsuperhero and the themes from that repository linked to your redmatrix theme directory.

You can do the same with addons. We'll have to come up with some "pull" scripts to keep updated but the clever folks will already know how to do this.
2015-02-19 19:48:07 -08:00
friendica
8d6e3f5390 add zotsh to util 2015-02-15 16:29:12 -08:00
friendica
7bb2e25ea0 missing param 2015-02-13 13:04:31 -08:00
friendica
7edab47658 get_rel_link broken - also weekly doc updates 2015-02-06 02:07:10 -08:00
friendica
ab0706521e let zot_refresh continue without a primary hub if one cannot be found. also weekly doc updates 2015-01-30 13:45:28 -08:00
friendica
a496036066 local_user => local_channel 2015-01-28 20:56:04 -08:00
friendica
0cdcc4bc50 doc updates 2015-01-23 03:25:17 -08:00
friendica
2372d9b42a make typo.php descend into include/RedDAV 2015-01-18 19:28:32 -08:00
friendica
8f8700ddd2 mod_prep usability enhancements, doc updates 2015-01-16 00:53:04 -08:00
friendica
c75cdbd304 doc updates 2015-01-10 13:04:43 -08:00
friendica
ed2917118d doc updates 2015-01-02 17:26:57 -08:00
Erik Lundin
d029d3a9f9 Don't trim escaped quotes 2014-12-29 17:24:53 +01:00
friendica
7ba92feabf doc update 2014-12-26 00:13:22 -08:00
friendica
26105b53d4 doc updates 2014-12-19 00:29:10 -08:00
friendica
452d275b5e don't import to sys channel from self-censored authors 2014-12-12 00:26:07 -08:00
friendica
58067c24fc block adult channels from inclusion in public content feeds 2014-12-10 16:24:31 -08:00
friendica
123a778ae1 update mozilla cacert.pem 2014-11-28 18:48:10 -08:00
friendica
b16f938830 random block widget 2014-11-22 12:26:04 -08:00
friendica
f299922df3 minor changes to support forum mode 2014-11-15 14:03:41 -08:00
friendica
26343b8856 rev update 2014-11-07 05:15:28 -08:00
friendica
7f0bd5a6e5 doc updates 2014-10-31 05:05:31 -07:00
friendica
59e19a1f45 moved post_to_red to its own project ( https://github.com/friendica/wptored ), which I was planning to do anyway since it's kind of lost in the util folder, but also because having it there may present licensing issues, as it's GPL. 2014-10-25 01:03:36 -07:00
friendica
1d8aa7d817 string update 2014-10-24 04:17:35 -07:00