Commit Graph

614 Commits

Author SHA1 Message Date
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 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