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

691 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
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