clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
18,776 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

722 Commits

Author SHA1 Message Date
Roland Häder 830af774d3
added more curly braces + a bit more usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-21 21:50:45 +01:00
Hypolite Petovan 7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
Roland Haeder 09851331a9
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-20 20:51:32 +01:00
Tobias Diekershoff 8bd8e858d0 regenerated master messages.po file 2017-03-20 08:27:10 +01:00
Michael 62915007c6 Test code removed 2017-03-20 04:37:59 +00:00
Michael aa4f9c985f Enhanced explanation 2017-03-20 04:37:13 +00:00
Michael 24ee60492b If the maintenance reason is a url, then redirect to this address 2017-03-19 19:03:09 +00:00
Michael 51f93346d6 Standards, like always 2017-03-19 14:57:36 +00:00
Michael 8dd732a896 Issue 3242: Define a maintenance reason 2017-03-19 13:24:07 +00:00
Roland Häder 720e7d6034
curly braces + spaces added 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:41:21 +01:00
Roland Häder 9cb100228a
addec curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:41:00 +01:00
Roland Häder 3849e7c9ff
added more curly braces + a bit more usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:40:47 +01:00
Tobias Diekershoff 0d83082343 regenerated master messages.po file 2017-03-03 10:31:10 +01:00
Michael Vogel 45ebeba643 Merge pull request #2916 from tobiasd/20160925-changes 
updateing credits and CHANGELOG
 2017-02-24 07:46:07 +01:00
Tobias Diekershoff 429d884c51 regen credits 2017-02-21 21:31:31 +01:00
Eelco Maljaars a32431e693 Added missing mbstring php module to xenial setup in vagrant 2017-02-19 15:44:48 +01:00
Michael Vogel d61a4a67db Merge pull request #3109 from Hypolite/issue/scrap-tinymce 
Scrap TinyMCE
 2017-01-27 21:08:33 +01:00
Hypolite Petovan 46fe6b1908 - Remove misc TinyMCE mentions in docs and minifyjs 2017-01-26 22:58:25 -05:00
Michael 0548099f6c The config class now makes less database reads. 2017-01-18 21:45:32 +00:00
Tobias Diekershoff 25ac6f8ea2 regen credits for correct umlaute 2016-12-24 10:47:57 +01:00
Tobias Diekershoff 5507a2caeb regenerated master messages.po file 2016-12-19 07:47:52 +01:00
Tobias Diekershoff 6f3e91d4c0 Michael may keep the typo 2016-12-09 18:11:27 +01:00
Tobias Diekershoff a564e31451 use %placeholder% instead of Friendica 2016-12-09 16:43:40 +01:00
Tobias Diekershoff f9b0beff8d only convert tables in friendica DB 2016-12-08 20:29:06 +01:00
Tobias Diekershoff ac5617c40c add frontend worker to the admin panel and regen master messages.po file 2016-12-06 08:44:59 +01:00
Michael 8d8faa8b7b Set the time limit of the deamon. 2016-11-27 23:58:26 +00:00
Michael d96b827e32 Changed documentation 2016-11-27 22:52:21 +00:00
Michael 80d2210895 We can now start the poller from a daemon as well. 2016-11-27 20:57:18 +00:00
Tobias Diekershoff 9f428bb264 regenerated master messages.po files after Hackathon 2016 2016-11-20 21:47:51 +01:00
Tobias Diekershoff 59c12db020 Merge pull request #2949 from silke/vagrant-1604 
Added Vagrant for Ubuntu 16.04
 2016-11-20 15:39:31 +01:00
Silke Meyer 2308a7d33e Vagrant does not download addons by default 2016-11-20 15:32:17 +01:00
Tobias Diekershoff 7aaaa0a3c7 Show a warning message in the admin panel when MyISAM is still in use 2016-11-20 09:50:14 +01:00
Silke Meyer 18f59b6bfe Vagrant: corrected hostnames 2016-11-19 18:05:38 +01:00
Silke Meyer 5024b7426c Vagrant: Allow to choose between Ubuntu 14.04 und 16.04 2016-11-19 16:08:08 +01:00
Tobias Diekershoff 78d8846fef new contributor 2016-11-15 08:33:47 +01:00
Tobias Diekershoff 74912a3b24 double contributor name filtered out for the credits generator 2016-11-15 08:19:24 +01:00
Tobias Diekershoff 77a26d3a1d new translator 2016-11-15 08:19:23 +01:00
Tobias Diekershoff 9c79d2b58a bug closed, new translator 2016-11-15 08:19:23 +01:00
Tobias Diekershoff ca55b048ac updateing chredits and CHANGELOG 2016-11-15 08:19:22 +01:00
Tobias Diekershoff 0e1b13f3dd regenerated master messages.po file 2016-11-10 15:43:47 +01:00
Tobias Diekershoff 6472c7292f regenerated master messages.po file 2016-11-06 16:01:07 +01:00
Tobias Diekershoff 82dcc3fe79 Merge pull request #2821 from Hypolite/Issue-#2817 
Fix #2817 - Move translation language folder in a subfolder of view
 2016-10-01 10:58:32 +02:00
Hypolite Petovan 8fc558b8e6 Fix #2817 
- Change all references to language folders
 2016-09-30 10:46:56 -04:00
Tobias Diekershoff 39e2be54c4 regenerated messages.po 2016-09-27 21:36:27 +02:00
Tobias Diekershoff 58fb593e72 regenerated messages.po to fix typos 2016-09-24 09:45:44 +02:00
Tobias Diekershoff ac395c2136 regenerated messages.po 2016-09-21 12:13:32 +02:00
Tobias Diekershoff 80ecb64f03 new contributor to the docs 2016-09-06 08:30:15 +02:00
Tobias Diekershoff 24197c30bc updated the credits 2016-08-19 12:38:45 +02:00
Tobias Diekershoff abc301aad8 regenerated credits 2016-08-14 22:19:49 +02:00
Tobias Diekershoff afdb8af5a4 regenerated messages.po file for new strings in Frio theme 2016-08-09 18:18:09 +02:00
Tobias Diekershoff 497fd34026 regenerated master messages.po for new strings in the admin panel 2016-08-04 09:09:43 +02:00
Tobias Diekershoff 39d149bf7c regenerated master messages.po file 2016-08-01 07:46:21 +02:00
Tobias Diekershoff cb7de01efe new contributor tu DE translations for the credits.txt 2016-07-21 09:21:51 +02:00
Michael Vogel 3cb38a8fff Merge pull request #2670 from tobiasd/20160709-credits 
regen credits.txt
 2016-07-10 09:28:41 +02:00
Tobias Diekershoff 080b567860 regen credits.txt 2016-07-09 12:10:22 +02:00
Tobias Diekershoff cacd07a5ea regen messages.po 2016-07-09 07:20:48 +02:00
Ben Roberts 22de27327c recreate fix for #2617 on correct branch 2016-06-18 08:16:09 -04:00
Tobias Diekershoff 38495f41dd regenerated master messages.po file 2016-05-18 22:43:49 +02:00
rabuzarus ed6ada0da5 rework autocomplete: use minified version + delete old fk.autocomplete.js 2016-04-15 02:25:58 +02:00
Michael Vogel 3c24f43011 Guesss what? Yeah, some documentation 2016-03-28 22:21:14 +02:00
Michael Vogel fab48926d0 Added some documentation, script to generate a basic doxygen header 2016-03-17 23:44:18 +01:00
Tobias Diekershoff 9d52a89c51 regenerated messages.po file for picking up the workers 2016-03-12 07:36:44 +01:00
Tobias Diekershoff b21275ee9c handle exception with non-existing addon directory 2016-02-17 08:00:38 +01:00
Michael Vogel b0548018d8 Simplepie is removed since we don't use it anymore 2016-02-14 19:50:59 +01:00
Tobias Diekershoff 3108406c9f Update to the strings 2016-01-24 06:52:09 +01:00
Tobias Diekershoff 080319d82d issue #2270 2016-01-20 17:52:58 +01:00
Tobias Diekershoff 9b4f8b58c1 regenerated messages.po 2016-01-18 18:52:17 +01:00
Tobias Diekershoff bcc8fa1971 regenerated messages.po file for translation work 2016-01-16 16:22:02 +01:00
Tobias Diekershoff bc9c3d80fa typos in OStatus (re)subscribing 2015-12-27 08:44:23 +01:00
rabuzarus be2d6fa85e little fix for @hooks in Doxyfile 2015-12-25 18:37:38 +01:00
rabuzarus f3395dd6f3 add custom tag @hooks to doxygen 2015-12-25 17:30:55 +01:00
Fabrixxm 7f76c3dd41 Merge branch 'master' into develop 2015-12-22 10:50:52 +01:00
Tobias Diekershoff c8b6c3bedf regenerated messages.po file, excluding addons-extra stuff 2015-12-14 07:51:27 +01:00
Tobias Diekershoff 448be5cfbd exclude addons-extra directory from the translation as well 2015-12-14 07:51:11 +01:00
Tobias Diekershoff fb66f27e8f regenerated messages.po 2015-12-13 08:55:17 +01:00
Tobias Diekershoff 49b4be1670 regenerated credits.txt 2015-12-11 08:04:35 +01:00
Fabrixxm 4f06107579 Fix generated po headers 2015-12-04 15:47:41 +01:00
Fabrixxm d53b23858a Rewrite util/php2po.php 
Fix #2046
 2015-12-04 14:09:17 +01:00
rabuzarus 76bb3f6673 doxygen: exclude some more folders 2015-12-03 16:17:25 +01:00
rabuzarus b31c602e9b added code reference to docs 2015-12-03 00:06:11 +01:00
Tobias Diekershoff 6da6504738 regenerated master messages.po file 2015-11-30 13:16:46 +01:00
Tobias Diekershoff 50c004aa5f regenerated credits.txt 2015-11-30 13:16:23 +01:00
Tobias Diekershoff afb8c87420 regenerated master messages.po file 2015-11-08 22:26:22 +01:00
hauke 78cc32031a ... and force the install 2015-11-07 17:14:00 +01:00
hauke 1213243f98 fix: wrong package name 2015-11-07 17:13:31 +01:00
hauke 6292077fea adding Imagick to vagrant installation as it is needed for none-jpg-image-processing 2015-11-07 17:06:36 +01:00
Silke Meyer a5af773bc8 Configuration for Vagrant running Ubuntu 14.04 2015-11-07 14:55:58 +01:00
Silke Meyer f1a48a81f4 Activate logging in vagrant VM 2015-11-07 12:28:41 +01:00
Tobias Diekershoff 44c3c9f569 intro note 2015-10-29 22:10:24 +01:00
Tobias Diekershoff 3be34f82ee get special contributors into the credits 2015-10-29 22:05:48 +01:00
Tobias Diekershoff a48156aab6 display names listed in credits.txt from /credits 2015-10-29 08:48:41 +01:00
Tobias Diekershoff bc8c6eb455 python script to generate the credits.txt from git log and translator names 2015-10-29 08:48:41 +01:00
Tobias Diekershoff 32a21bb02b regeneration of the messages.po file for attendance translation 2015-10-12 15:15:39 +02:00
Tobias Diekershoff 199bcdb7a0 regenerated messages.po file 2015-10-11 10:38:05 +02:00
Fabrixxm 69dd6869f2 update messages.po 2015-09-22 09:59:12 +02:00
Michael Vogel 5ac38b7f99 There is now only one central parameter for the global directory. 2015-09-15 22:29:02 +02:00
Tobias Diekershoff d867f97dea #1873added new translateable strings so regenerating core messages.po 2015-09-01 07:10:29 +02:00
Tobias Diekershoff 4c0d843b6c updates master messages.po file 2015-08-26 07:54:29 +02:00
Tobias Diekershoff 7eb2ad0b1d update to the master messagespo 2015-08-24 07:50:47 +02:00
Tobias Diekershoff 99fcf6c3e8 regenerated the master messages.po file 2015-08-23 17:10:10 +02:00
Tobias Diekershoff 42134fedb2 updated master messages.po file 2015-08-17 09:53:03 +02:00
Tobias Diekershoff bb197eee2d base messages.po updated 2015-08-13 11:58:41 +02:00
Tobias Diekershoff 5d68da5266 updated the messages.po file for translations 2015-08-02 13:56:39 +02:00
Silke Meyer c56ccd225c Vagrant user doesn't have to tun the actual installation anymore. Test database is imported, htconfig is set, not generated to prevent installation routine. 2015-07-23 22:06:18 +02:00
Tobias Diekershoff eb79f109d4 update to the master strings 2015-07-08 13:20:43 +02:00
Fabrixxm 2c8a70db58 update util/messages.po 2015-06-30 08:44:16 +02:00
Fabrixxm 1cc104af70 update util/messages.po 2015-06-29 15:59:28 +02:00
Fabrixxm 03d30983f6 Add new option "-s" to run_xgettext. Fix paths. 
with this option, current directory is scanned for strings, and message.po is saved in lang/C subdir.
This is usefull when developing new addons outside from friendica tree.
 2015-06-29 15:58:48 +02:00
Sandro Santilli 904b76df85 Spelling error: "acepted" -> "accepted" 2015-06-26 12:03:32 +02:00
fabrixxm 258612d20c update messages.po 2015-05-24 10:39:36 +02:00
fabrixxm fd8f25007b update message.po 2015-05-21 10:47:59 +02:00
fabrixxm 914fa4c420 fix run_xgettext.sh 
ignore smarty3/compiled folder
 2015-05-21 10:45:17 +02:00
fabrixxm 506e745dd2 update messages.po 2015-05-20 21:55:52 +02:00
fabrixxm 2d3437daa3 different help text for different network 2015-04-04 18:02:26 +02:00
Tobias Diekershoff e8155a6df0 regenerated master strings 2015-02-09 08:58:22 +01:00
Tobias Diekershoff 8a55e20143 regenerated master message.po 2015-02-04 11:38:34 +01:00
Tobias Diekershoff 11fd20fdc2 Merge pull request #1346 from tobiasd/20150202-strings 
updated master string file
 2015-02-03 20:05:11 +01:00
Silke Meyer 05af400937 Fixed missing sudo, improved local mail in vagrant. 2015-02-02 22:57:10 +01:00
Tobias Diekershoff e34636625f updated master string file 2015-02-02 22:41:38 +01:00
Silke Meyer d1c3d897d8 preps to read mail in vagrant 2015-02-02 16:05:47 +01:00
Silke Meyer 1f5d8167c7 Added local mail delivery for vagrant (postfix). 2015-01-30 17:03:42 +01:00
Tobias Diekershoff 11f88e15be update to the master strings 2015-01-22 18:18:31 +01:00
Silke Meyer 86623bcdae Script now installs missing add-apt-repository tool. 2015-01-14 17:57:25 +01:00
fabrixxm 418ac91c31 Merge pull request #1274 from annando/issue-1218 
Issue 1218: generate $argv and $argc from $_SERVER if it wasn't defined
 2015-01-09 11:44:38 +01:00
Johannes Schwab 1a8ea8ba14 fix merge function of util/run_xgettext.sh 2015-01-08 13:59:42 +01:00
fabrixxm 6c66ebf806 remove util/typohelper.php and call php -l in util/typo.php to 
check syntax errors
 2015-01-05 11:59:12 +01:00
Michael Vogel cce561708a Replaced $argv and $argc with the $_SERVER array 2015-01-04 13:24:16 +01:00
Fabrixxm 97d34f02da update messages.po 2014-10-22 10:12:58 +02:00
Fabrixxm d3edc513c2 run_xgettext.sh: fix xgettext warnings 2014-10-22 10:12:27 +02:00
hauke f68df6a9b0 made vagrant partly work again 2014-09-15 19:48:47 +02:00
fabrixxm ec1d321e33 update messages.po 2014-09-07 14:32:41 +02:00
hauke 0349127473 bug fix #1097 2014-09-05 23:57:17 +02:00
Tobias Diekershoff 1adb31e0f0 revup and regenerating the message.po 2014-08-10 15:15:31 +02:00
Tobias Diekershoff e52bc5989b redo util/message.po 2014-06-22 11:15:40 +02:00
tobiasd 64946972b2 Merge pull request #1028 from tugelbend/master 
Vagrant configuration to instantiate development boxes easily
 2014-06-22 09:36:25 +02:00
Hauke Altmann e89e8d2914 adjusted configuration due to problems with mailcatcher 2014-06-20 18:32:40 +02:00
Hauke Altmann c23de3a64e added vagrant configuration for running a friendica development instance 2014-06-20 16:05:44 +02:00
Fabrixxm ca5da9f9af update master strings 2014-05-16 11:05:16 +02:00
Tobias Diekershoff 4075b872bf update to the master strings 2014-05-16 07:55:17 +02:00
Tobias Diekershoff de51106cde get strings from #942 into the master strings for translation 2014-04-26 09:24:29 +02:00
Tobias Diekershoff 44c45367a2 update for the base strings 2014-04-25 08:30:20 +02:00
fabrixxm 7c20d5e375 Update run_xgettext.sh 
missing a ´*´
 2014-01-23 11:15:56 +01:00
fabrixxm 7e05c7377b Make transifex happy 
transifex no more accept message.po with "Plural-Forms" commented out. now the line is completely removed.
 2014-01-23 10:02:18 +01:00
fabrixxm 40f414f11e Update messages.po 2014-01-14 10:11:06 +01:00
Tobias Diekershoff eaaa7b563b regenerated the util/message.po file so translations can get the new strings 2013-12-31 18:18:47 +01:00
Tobias Diekershoff 67dccb2fc7 update to the master string files 2013-11-17 15:46:46 +01:00
Tobias Diekershoff a8d87d5242 update to util strings.php 2013-11-07 09:43:19 +01:00
Tobias Diekershoff bf48885bed update to the util/message.po file to new strings can be translated 2013-11-07 09:33:33 +01:00
Fabrixxm 4d7ec38933 update message.po 2013-10-29 14:17:21 -04:00
friendica bfc9cfb82f put tags in items 2013-06-26 04:02:04 -07:00
friendica 1c10cf1ad7 -- #039; is not a tag 2013-06-21 05:00:30 -07:00
friendica efce5ae1b9 Merge https://github.com/friendica/friendica into pull 2013-06-12 21:42:20 -07:00
friendica 2464915817 don't try to parse empty xml with simplepie, throws conversion warning 2013-06-12 21:41:07 -07:00
Zach Prezkuta 127b7a589e eliminate Cropper conflicts with jQuery 2013-06-01 10:42:51 -06:00
friendica b60e42d2fa provide bbcode translation for imported red zmg tag (img tag with zot-id) 2013-05-28 04:52:22 -07:00
friendica 0cc641fbbc messaging 2013-05-22 22:30:53 -07:00
friendica ed6ca1d384 rev update 2013-05-21 22:37:51 -07:00
friendica a1c4d0ca93 fix include paths when started via cmdline 2013-05-20 17:36:29 -07:00
friendica 6ec1bd2fa8 double quotes in title mess up editpost 2013-05-18 16:02:31 -07:00
friendica 0ce68665c6 check_config is gone - use check_db 2013-05-13 17:22:07 -07:00
friendica aee7429967 Merge https://github.com/friendica/friendica into pull 2013-05-11 17:04:51 -07:00
friendica e8fc26e74e rev update 2013-05-11 17:04:23 -07:00
fermionic 3a13aba62e Merge pull request #674 from fermionic/20130503-basic-video-support 
basic video playback support using VideoJS
 2013-05-11 08:33:36 -07:00
friendica 2c8d33a6e2 rev update 2013-05-09 01:15:22 -07:00
Zach Prezkuta fec4581f34 basic video playback support using VideoJS 2013-05-03 18:17:56 -06:00
friendica 185d29c41e undefined element 2013-05-02 21:42:34 -07:00
friendica 61a0f9c196 bug #540 and hush up a couple of log messages that are way too verbose 2013-04-28 04:30:20 -07:00
friendica 1ed6a2bd3d rev update 2013-04-25 02:36:52 -07:00
friendica f4b3cf980d rev update 2013-04-23 18:51:35 -07:00
friendica bc68892cf9 rev update 2013-04-21 16:07:02 -07:00
friendica a13e7b8a38 rev update 2013-04-19 04:51:43 -07:00
friendica 9660117c70 sync username when changed in either the default profile or the settings page 2013-04-04 15:10:14 -07:00
friendica db0bb50e37 rev update 2013-04-03 16:28:49 -07:00
friendica 17cb682ed0 rm addon.old 2013-03-19 03:30:50 -07:00
friendica 1ff37ca4c1 double encode any text that is destined for meta fields. 2013-03-18 16:40:33 -07:00
Fabrixxm 3d3aebeda1 fix bug in run_xgettext, update messages.po 2013-02-28 10:14:40 -05:00
Fabrixxm 5214eb2bda update util/messages.po 2013-02-27 09:44:05 -05:00
Fabrixxm a1746a9fd2 run_xgettext: check for dir before run xgettext 2013-02-27 09:42:20 -05:00
Fabrixxm 9d99a531b9 update translation utils: 
po2php: add "if function_exists" around plural select function
run_xgettext: add option to extract strings from addon folder
 2013-02-27 08:25:03 -05:00
friendica 5205a374ee block injection vector 2013-02-26 17:33:18 -08:00
friendica c8717ede42 rev update 2013-02-22 17:12:03 -08:00
friendica 615b060352 rev update 2013-02-21 16:42:34 -08:00
friendica d653bc4dbd rev update 2013-02-17 17:23:19 -08:00
friendica 6242f9a147 add .gif to fix_private_photos checking, try another tactic to reduce notification duplication - check for duplicates after storage rather than before. This tactic worked out well to reduce item duplication. 2013-02-07 23:43:55 -08:00
friendica ff8c1be987 Merge pull request #609 from fermionic/20130204-move-tpl-scripts-to-util 
move tpl scripts to util
 2013-02-05 17:19:23 -08:00
friendica 79e9214a75 Merge https://github.com/friendica/friendica into pull 2013-02-05 15:10:23 -08:00
friendica 9bf8364506 rev update 2013-02-05 15:09:28 -08:00
Zach Prezkuta 53e5592f9a move tpl scripts to util 2013-02-04 22:55:15 -07:00
Zach Prezkuta 0e67ba2bd4 update minified javascripts 2013-02-04 18:16:13 -07:00
Zach Prezkuta 7d3a923294 script for minifying javascript files 2013-01-31 19:05:27 -07:00
friendica de0098a6b4 rev update 2013-01-29 18:35:25 -08:00
friendica ce8f31504e rev update 2013-01-27 13:13:08 -08:00
friendica 04b48688b6 add form security to invite page and set maximum per user invites 2013-01-25 13:48:57 -08:00
friendica b3b0a9de24 die forcefully but gracefully on missing api templates 2013-01-23 17:07:55 -08:00
friendica 20eb767b7e don't run two processes for every web access (noticed that dbupdate is always started as a background task under normal operation). 2013-01-18 17:37:45 -08:00
friendica 30f1fb2c4d provide a date indication in reshared content 2013-01-15 14:58:50 -08:00
fermionic b920ce732c Merge pull request #585 from fermionic/20130114-maintenance-mode 
add maintenance mode
 2013-01-14 18:18:34 -08:00
friendica 66a6970bb8 config cli will also work with Friendica without change - so bringing it over 2013-01-14 15:50:39 -08:00
Zach Prezkuta 31c3bbf549 add maintenance mode 2013-01-14 16:35:41 -07:00
friendica b5c0714bc4 fix live update on display page 2013-01-12 15:08:59 -08:00