Commit graph

604 commits

Author SHA1 Message Date
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
c8b6c3bedf regenerated messages.po file, excluding addons-extra stuff 2015-12-14 07:51:27 +01:00
448be5cfbd exclude addons-extra directory from the translation as well 2015-12-14 07:51:11 +01:00
fb66f27e8f regenerated messages.po 2015-12-13 08:55:17 +01:00
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
6da6504738 regenerated master messages.po file 2015-11-30 13:16:46 +01:00
50c004aa5f regenerated credits.txt 2015-11-30 13:16:23 +01:00
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
44c3c9f569 intro note 2015-10-29 22:10:24 +01:00
3be34f82ee get special contributors into the credits 2015-10-29 22:05:48 +01:00
a48156aab6 display names listed in credits.txt from /credits 2015-10-29 08:48:41 +01:00
bc8c6eb455 python script to generate the credits.txt from git log and translator names 2015-10-29 08:48:41 +01:00
32a21bb02b regeneration of the messages.po file for attendance translation 2015-10-12 15:15:39 +02:00
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
d867f97dea #1873added new translateable strings so regenerating core messages.po 2015-09-01 07:10:29 +02:00
4c0d843b6c updates master messages.po file 2015-08-26 07:54:29 +02:00
7eb2ad0b1d update to the master messagespo 2015-08-24 07:50:47 +02:00
99fcf6c3e8 regenerated the master messages.po file 2015-08-23 17:10:10 +02:00
42134fedb2 updated master messages.po file 2015-08-17 09:53:03 +02:00
bb197eee2d base messages.po updated 2015-08-13 11:58:41 +02:00
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
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
e8155a6df0 regenerated master strings 2015-02-09 08:58:22 +01:00
8a55e20143 regenerated master message.po 2015-02-04 11:38:34 +01:00
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
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
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
1adb31e0f0 revup and regenerating the message.po 2014-08-10 15:15:31 +02:00
e52bc5989b redo util/message.po 2014-06-22 11:15:40 +02:00
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
4075b872bf update to the master strings 2014-05-16 07:55:17 +02:00
de51106cde get strings from #942 into the master strings for translation 2014-04-26 09:24:29 +02:00
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
eaaa7b563b regenerated the util/message.po file so translations can get the new strings 2013-12-31 18:18:47 +01:00
67dccb2fc7 update to the master string files 2013-11-17 15:46:46 +01:00
a8d87d5242 update to util strings.php 2013-11-07 09:43:19 +01:00
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
friendica
dfee9faca5 rev update 2013-01-10 22:27:41 -08:00
friendica
51eb0cd59d rev update 2013-01-10 01:08:36 -08:00
friendica
de0315396c missing session template_engine calls 2013-01-08 12:24:13 -08:00
friendica
4ab363ed71 bypass smarty wherever using intltext_templates (install, register, friend confirmation emails, etc.) 2013-01-07 20:14:00 -08:00
friendica
9fbaa0d383 rev update 2013-01-04 15:14:00 -08:00
friendica
e394ccd0a8 If we're going to encode the email headers, we probably should use the encoded version rather than the original 2013-01-03 03:47:08 -08:00
friendica
66b1448cdb rev update 2013-01-01 17:32:46 -08:00
friendica
017042d5d4 rev update 2012-12-31 14:54:04 -08:00
friendica
215a7f139c make smarty error reporting a bit less chatty 2012-12-30 00:29:07 -08:00
friendica
f962ecdd64 Merge https://github.com/friendica/friendica into pull 2012-12-29 02:36:19 -08:00
friendica
05996457f9 receiving post from archived Diaspora contacts 2012-12-29 02:35:41 -08:00
Zach Prezkuta
e684324032 use explicit include paths 2012-12-28 14:51:50 -07:00
friendica
255771f295 rev update 2012-12-27 13:36:23 -08:00
friendica
2684981941 rev update 2012-12-26 13:09:00 -08:00
friendica
6b36927d32 rev update 2012-12-22 22:59:12 -08:00
friendica
0f13995035 rev update 2012-12-19 03:15:48 -08:00
friendica
3f63a69d7a divide by zero on incorrectly specified oembed thumbnail size 2012-12-16 17:58:12 -08:00
friendica
6faadc9662 anybody can see the "remove category" link, though it doesn't do anything if you aren't the owner. Can't believe this has gone so long without being reported. 2012-12-13 14:15:18 -08:00