Commit Graph

24488 Commits

Author SHA1 Message Date
zzottel a38710aa4e Merge pull request #224 from zzottel/master
update to German strings
2015-12-16 14:01:33 +01:00
zottel 020fea3031 update to German strings 2015-12-16 14:00:23 +01:00
zzottel b4102489aa Merge pull request #223 from zzottel/master
remove directory red.zottel.red, add hubzilla.zottel.net instead
2015-12-16 12:32:17 +01:00
Wave 871ee0f571 Merge pull request #222 from wave72/master
Updated Italian strings
2015-12-16 09:13:40 +01:00
zottel f0d90005ea remove directory fallback server red.zottel.red, add hubzilla.zottel.net instead 2015-12-16 09:06:20 +01:00
Paolo Tacconi 933e105f32 Updated Italian strings 2015-12-16 09:00:27 +01:00
redmatrix 9b4e6e1ec0 some more minor api tweaks 2015-12-15 20:21:40 -08:00
redmatrix 46e4d2d573 bring back the schemaspy makefile 2015-12-15 20:00:48 -08:00
redmatrix 2aa3acae6b remove deprecated table 2015-12-15 19:46:24 -08:00
redmatrix 8514789da9 additional fix for the array_key_exists message in #221 2015-12-15 17:50:14 -08:00
redmatrix 20dcf37976 issue #221 2015-12-15 17:42:49 -08:00
redmatrix 38d513181d Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-12-15 15:17:39 -08:00
redmatrix f121b74bec enhance whitespace 2015-12-15 15:17:10 -08:00
redmatrix cb8cccc537 fix typos before merging 2015-12-15 15:13:16 -08:00
redmatrix 2924b9182e revise the photo activity a bit so that we always have a valid activity body. Several network connectors can get empty posts or posts that don't contain any reference whatsoever to the actual photo. Since this can cause duplicate images on our own site, just provide the activity summary and any included body text to the activity by default. Provide a function to enhance this activity with an actual photo which can be applied on demand for any network connectors that desire it. Otherwise they'll just get a link to the photo in the activity statement - which is better than an empty post. Have applied this "add actual photo to the post" function to both Diaspora and RSS feeds. Also provide the album as the activity target. 2015-12-15 15:01:54 -08:00
jeroenpraat 5a59cd9b8c Invitation only added to the admin site page. Plus css wrapper class to docu search. 2015-12-15 21:00:40 +01:00
redmatrix ba463afbdc even more queue api 2015-12-15 00:42:19 -08:00
redmatrix 6f2a5117dc more queue api 2015-12-15 00:04:30 -08:00
redmatrix b13241564b more work on queue api 2015-12-14 22:44:05 -08:00
redmatrix 76816de3aa simplify queue insertion for normal items 2015-12-14 20:49:12 -08:00
redmatrix 49108c230b regenerate the item body for linked photo items that now have no body to provide legal activities when going to other networks. Remove the signature since the signed text was an empty string and we've just replaced it with content that will not verify. 2015-12-14 17:58:39 -08:00
redmatrix b32bba47c8 set following to false 2015-12-14 17:25:40 -08:00
Haakon Meland Eriksen 3b1ab5e79c Merge remote-tracking branch 'upstream/master' 2015-12-14 18:55:43 +01:00
redmatrix dcf7946673 revert include/photos.php:L380 2015-12-14 02:34:18 -08:00
redmatrix fdd2da905a more work on api media uploads 2015-12-13 19:15:42 -08:00
redmatrix 2cceca49e9 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-12-13 15:37:26 -08:00
redmatrix bb0e4044bf remove the unqualified "OAuth" namespace from the project. We need to reference either OAuth1 or OAuth2. 2015-12-13 15:35:45 -08:00
jeroenpraat 7244dfce1d Typos 2015-12-12 17:32:29 +01:00
jeroenpraat fb5ac37ca2 That script is taken from someone else without any contribution (http://blog.strictly-software.com/2013/07/apache-performance-tuning-bash-script.html). Also the English is very bad. Anyway, I've replaced it with some general tips that all web admins should know. 2015-12-12 17:30:02 +01:00
jeroenpraat f0a588547d Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-12-12 17:02:01 +01:00
jeroenpraat 04d3ac9aaf es+nl strings update 2015-12-12 17:01:43 +01:00
Haakon Meland Eriksen 565126a888 Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version 2015-12-12 10:00:15 +01:00
redmatrix 395268da22 a couple of api improvements 2015-12-11 21:10:20 -08:00
redmatrix ac3075bef7 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-12-11 17:01:23 -08:00
redmatrix 1f4c596841 add deprecated update_with_media endpoint 2015-12-11 17:00:45 -08:00
redmatrix 6613275cc2 Merge pull request #215 from royalterra/master
Add Link and extra Doc to Apache Configuration
2015-12-12 09:15:24 +11:00
Haakon Meland Eriksen e7d9863432 Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version 2015-12-11 19:40:09 +01:00
Haakon Meland Eriksen b9af0645c2 Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version 2015-12-11 19:34:29 +01:00
redmatrix 9fb7a12849 incorrect obj_type on several items 2015-12-11 02:52:43 -08:00
royalterra 4633273279 Update INSTALL.txt
Add Link to ApacheTune for configure mod Prefork
2015-12-11 09:49:14 +00:00
royalterra d0482133a5 Update INSTALL.txt 2015-12-11 09:48:04 +00:00
royalterra 4ff31d0a41 Merge pull request #1 from redmatrix/master
merge branches
2015-12-11 09:39:01 +00:00
redmatrix f73c82632f some minor cleanup - change the default of the discover tab (public stream access) 2015-12-10 19:18:55 -08:00
redmatrix 8389d8677d some major cleanup of api authentication stuff - still needs much more and this still may not solve #206 2015-12-10 16:39:46 -08:00
redmatrix 7fa944ed95 don't spit out sabre xml on permission denied exceptions, just provide a 401 2015-12-10 15:13:10 -08:00
redmatrix 2340092008 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-12-10 14:44:37 -08:00
jeroenpraat 6cd3296c08 Missing underscores in doc 2015-12-10 23:32:25 +01:00
Haakon Meland Eriksen d86bc0b6cf Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version 2015-12-10 20:43:32 +01:00
Haakon Meland Eriksen e01d4f289b Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version 2015-12-10 07:27:42 +01:00
redmatrix 8e1e301764 refactor a few more redundant returns 2015-12-09 21:03:29 -08:00