Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-19 23:03:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
19915 commits 3 branches 64 tags 249 MiB
Commit graph

742 commits

Author SHA1 Message Date
Tobias Diekershoff
d459a825ae add Ratten to the special contributors who are not found in git and messages.po files 2017-11-26 10:58:15 +01:00
Hypolite Petovan
05a09adb3b
Merge pull request #3952 from tobiasd/20171125-silentium2 
update to the silence script
 2017-11-25 11:14:54 -05:00
Tobias Diekershoff
2ac797be8e let there be SPACE 2017-11-25 17:10:29 +01:00
Tobias Diekershoff
2d61aaf118 some minor stuff 2017-11-25 17:05:27 +01:00
Hypolite Petovan
f54faf1363
Merge pull request #3951 from tobiasd/20171125-blockaccount 
Script to block an account from the node
 2017-11-25 11:04:22 -05:00
Tobias Diekershoff
8a91e631cf some more minor stuff 2017-11-25 17:02:42 +01:00
Tobias Diekershoff
32d71dbfcc update to the silence script 2017-11-25 16:55:58 +01:00
Tobias Diekershoff
d9185540a5 some minor stuff 2017-11-25 16:45:20 +01:00
Tobias Diekershoff
2d65eae2f5 Script to block an account from the node 2017-11-25 16:40:03 +01:00
Michael Vogel
5778747ad0
Merge pull request #3948 from tobiasd/20172511-silentium 
silence accounts from global community page
 2017-11-25 16:30:13 +01:00
Tobias Diekershoff
9f0e8cffba use all profile formats, typos 2017-11-25 16:25:53 +01:00
Tobias Diekershoff
8c2b678aaa silence accounts from global community page 2017-11-25 15:16:55 +01:00
hoergen
d7f0c08bce Added Description for creating a bookmark 2017-11-25 01:49:18 +01:00
hoergen
d672f39930 Bookmarklet for sharing links to friendica 2017-11-24 22:11:57 +01:00
Michael
0c35dff73d One script needed to be moved, one script was obsolete 2017-11-19 22:47:12 +00:00
Michael
920160cb28 The poller is now the worker 2017-11-19 21:47:21 +00:00
Michael
cabfcfc904 We now are having a "scripts" folder 2017-11-19 21:21:54 +00:00
Hypolite Petovan
ede20ac95a Updated Composer to version 1.5.2 2017-11-09 02:11:33 -05:00
Adam Magness
0dfa57948f Issue-#3873 
Replace deprecated functions with new syntax.
 2017-11-07 06:24:39 -05:00
Tobias Diekershoff
9c5000e0b0 regenerated master messages.po file 2017-11-07 07:04:43 +01:00
Tobias Diekershoff
bdf0a62fdd regenerated master messages.po file 2017-10-13 07:28:17 +02:00
Michael
225eea2ca6 Avoid undefined class variables 2017-10-11 14:52:08 +00:00
Michael
a29b7e7153 "dba" is now a static class 2017-10-11 12:56:36 +00:00
Tobias Diekershoff
97347692ac give the admin user the admin panel in the Vagrant VM 2017-10-05 12:58:53 +02:00
Tobias Diekershoff
2bcd5b3243 Merge pull request #3757 from silke/develop 
Develop
 2017-10-05 07:55:00 +00:00
Silke Meyer
ab87f1215a Merge remote-tracking branch 'upstream/develop' into develop 2017-10-04 21:28:35 +02:00
Silke Meyer
eadeb3ed21 Fixed settings for test mysql database and updated documentation 2017-10-04 20:25:15 +02:00
Tobias Diekershoff
59b8b7dbee regenerated master messages.po file 2017-10-01 08:56:06 +02:00
Michael
2971501f63 The direct structure call is now only executed when called via the poller.php 2017-09-30 17:12:27 +00:00
Tobias Diekershoff
6616c2f094 regen credits 2017-09-27 16:32:12 +02:00
Tobias Diekershoff
30bc6ab088 regenerated master messages.po file 2017-09-15 10:08:26 +02:00
Silke Meyer
106f4e62cf Calling apt-get install twice less 2017-09-07 11:29:22 +02:00
Silke Meyer
50cec46d1f Vagrant only for Xenial, more RAM for debugging, no poller 2017-09-06 10:00:06 +02:00
Silke Meyer
663b6e9300 do not import test sql for the moment 2017-09-04 12:35:22 +02:00
Tobias Diekershoff
ef54a283ab regenerated master messages.po file 2017-08-26 09:48:05 +02:00
Michael
5c53544118 Removed external pubsubhubbub URL 2017-08-25 02:58:38 +00:00
Tobias Diekershoff
0fb7793bfa regenerated master messages.po file 2017-08-12 09:43:28 +02:00
Tobias Diekershoff
b81499a7fc regen credits 2017-07-23 19:54:08 +02:00
Tobias Diekershoff
e88a999a72 regenerated master messages.po file 2017-07-10 18:59:59 +02:00
AndyHee
0a71a55fd0 Regenerated master messages.po file 2017-06-20 13:15:23 +07:00
Tobias Diekershoff
de5a0dadb0 Merge pull request #3534 from AndyHee/20170609-User_settings 
Better input hints, user settings, account types
 2017-06-09 12:39:50 +02:00
Andy H3
ccbb50b589 Regenerated master messages.po file 2017-06-09 16:44:42 +07:00
Andy H3
7f0988a103 Regenerated master messages.po file 2017-06-09 15:42:31 +07:00
Hypolite Petovan
ad4cdf2a9d Replace lowercase operators 2017-06-08 21:03:44 -04:00
Hypolite Petovan
9c0d2c31e8 Replace AND and OR in PHP conditions by && and || 2017-06-07 22:00:59 -04:00
Tobias Diekershoff
a98e1e5590 Merge pull request #3490 from tobiasd/20170524-credits 
regen credits
 2017-06-06 07:00:02 +02:00
Hypolite Petovan
cbd3edbc05 Update remaining "dir.friendi.ca" instances 2017-06-02 22:15:43 -04:00
Tobias Diekershoff
6c096f4ebd regenerated master messages.po file 2017-05-28 11:10:48 +02:00
Tobias Diekershoff
d48a277624 regen credits 2017-05-24 14:46:27 +02:00
rabuzarus
fb0d335268 Update Doxyfile (add src folder) 2017-05-16 17:36:19 +02:00
Hypolite Petovan
86cae070f2 Merge branch 'develop' into improvement/move-app-to-src-2 2017-05-07 12:58:11 -04:00
Hypolite Petovan
87b513dd03 Check src folder in util/typo.php + make it executable 2017-05-03 23:04:14 -04:00
Tobias Diekershoff
6f520a986f regenerated master messages.po file 2017-05-03 07:11:33 +02:00
Hypolite Petovan
569cd459ec Add basepath to App 2017-05-02 23:37:57 -04:00
Hypolite Petovan
3437e73ae4 Yet more standards 2017-05-02 23:37:50 -04:00
Hypolite Petovan
1d427aa214 Standards: Remove EOF closing PHP tags 2017-05-02 23:36:56 -04:00
Hypolite Petovan
20043914e6 Move App to src 
- Add `use Friendica\App;` wherever needed
 2017-05-02 22:59:36 -04:00
Hypolite Petovan
56ee734b00 Cleanup /format pre-move 2017-05-02 22:59:24 -04:00
Michael Vogel
09aa02796e Merge pull request #3400 from tobiasd/20170427-credits 
regen credits
 2017-04-27 10:47:08 +02:00
Tobias Diekershoff
8e88a84881 regen credits 2017-04-27 07:42:21 +02:00
Tobias Diekershoff
c76dcc6bab regenerated master messages.po file 2017-04-27 07:35:43 +02:00
Tobias Diekershoff
e178f04a0e regen credits 2017-04-20 07:59:54 +02:00
Alexandre Alapetite
a2a03c3f70 Default UTF8MB4 for CREATE DATABASE 2017-04-16 16:04:38 +02:00
Hypolite Petovan
9237b2611a Merge branch 'develop' into rewrites/coding-convention-split2 2017-04-03 06:35:27 -04:00
Hypolite Petovan
c97b1d6c03 Add executable composer.phar in util 2017-04-01 01:24:10 +02:00
Roland Haeder
48a1d97f46
closed internal TODO, added parentheses as this is a minimized if/else block 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:30:12 +01:00
Roland Haeder
b830d839f0
added a space 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:27:52 +01:00
Roland Haeder
1d48801d70
Continued: 
- added spaces
- made a code block even

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:25:51 +01:00
Roland Haeder
566cfb8418
space-time season continues ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-24 22:45:09 +01:00
Roland Haeder
221cfa8c22
added curly braces #3254 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 21:44:01 +01:00
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