friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
16,610 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

641 Commits

Author SHA1 Message Date
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
Andy H 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 H ccbb50b589 Regenerated master messages.po file 2017-06-09 16:44:42 +07:00
Andy H 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