Commit Graph

2018 Commits

Author SHA1 Message Date
Tobias Diekershoff 2a760bb770 Friendica 2018.05 2018-06-01 09:29:18 +02:00
Pascal Deklerck 99a88b16ff 4419 update DB version & database.sql 2018-05-29 16:11:25 +02:00
Michael bdbc51229a Fix for not being able to delete items 2018-05-26 18:07:27 +00:00
Michael e9848d7b8f End subscription for unreachable subscribers 2018-05-19 03:56:29 +00:00
Michael feb3d76a5b Fix: Subscriptions from GNU Social partially don't work 2018-05-18 12:18:12 +00:00
Michael 5a1e1c1ec9 Fix to OStatus delivery to be not so blocking to other tasks 2018-05-17 22:17:03 +00:00
Michael 3b2752c2fe Follow up to PR 5060: Missing index update 2018-05-16 08:59:15 +00:00
Roland Haeder 77cca70562
replaced some tabs -> spaces + added curly braces #3254
Signed-off-by: Roland Haeder <roland@mxchange.org>
2018-05-14 22:49:56 +02:00
Michael aafc314ccc Corrects falsely blocked contacts because of some bug in the develop branch 2018-05-10 10:41:32 +00:00
Michael 6c35f8ebf3 Update script for setting author-id and owner-id in item and thread table 2018-05-08 17:50:06 +00:00
Tobias Diekershoff 574191104b time for a RC 2018-05-07 20:28:13 +02:00
Michael Vogel bd0ba24518
Merge pull request #4951 from MrPetovan/bug/4946-move-current-theme-to-app
Move current_theme() to App
2018-04-29 19:11:49 +02:00
Hypolite Petovan 220242b55a Remove current_theme() and current_theme_url() functions 2018-04-28 18:37:41 -04:00
Hypolite Petovan 5bb35756dc Update directory URL protocol 2018-04-27 20:56:34 -04:00
Michael ba35b19af6 Public federated items now always are having an entry with "uid=0" 2018-04-23 11:14:25 +00:00
rabuzarus 130e16968e local_user() could also be a remote_user() 2018-04-12 17:10:48 +02:00
Michael a75858f02c Don't queue relay posts 2018-04-08 09:46:47 +00:00
Michael e65bd0325e Added server discovery for their relais configuration 2018-03-26 05:44:53 +00:00
Michael 5bca333bf0 Fix: No "not null" when text is replaced by varchar 2018-03-24 21:57:50 +00:00
Hypolite Petovan 9abe3dade2 Bump database version number after RC merge 2018-03-23 20:01:53 -04:00
Hypolite Petovan ecd660cb10 Updated version number 2018-03-23 06:39:51 -04:00
Hypolite Petovan 27d94023ee Merge branch 'master' into develop 2018-03-23 06:15:55 -04:00
Tobias Diekershoff bacc5de3a2 Friendica version 3.6 - The Tazmans Flax-lily 2018-03-23 07:14:49 +01:00
Michael 5bd519efff There is now a "content-warning" field 2018-03-14 22:28:35 +00:00
Hypolite Petovan 354bec58c0 Ensure BaseObject::setApp() whenever App is instantiated 2018-03-07 12:34:47 -05:00
Hypolite Petovan 41d5c7d4c7 Restore deprecated constants in boot 2018-03-04 23:13:19 -05:00
Hypolite Petovan 1a18220059 Remove unused global cache constants 2018-03-04 23:13:19 -05:00
Hypolite Petovan 3628b62aeb Add support for Memcached/Improve database cache
- Create Cache Driver interface
- Update cache table fields
- Add CacheSessionHandler
2018-03-04 23:13:19 -05:00
Tobias Diekershoff fab9cb6825 Version 3.6-rc for the RC branch 2018-03-03 07:36:58 +01:00
Hypolite Petovan 41678ec3cd Add no_update flag to speed up Contact::getIdForURL instances 2018-03-01 19:54:45 -05:00
Michael fe68e99c7c The tag query should be much faster now 2018-02-26 06:59:32 +00:00
Michael ecc0395151 Only do a database update when the current system version is lower 2018-02-21 04:06:17 +00:00
Michael 6e642ad6d4 Only not generate prefix when parameter is false 2018-02-21 03:37:20 +00:00
Michael a3af6807ac Improved resource id creation 2018-02-20 10:02:07 +00:00
Michael 6c26dcf1c7 The network is now just a 4 character field 2018-02-19 13:58:04 +00:00
Michael 2a762868e9 Some clean up for the worker, arrays are now supported as parameter 2018-02-11 16:18:39 +00:00
Michael d42f86e218 We can now delegate again like before 2018-02-08 22:18:34 +00:00
Michael d70a20a466 We now incrementally calculate the queue delivery time 2018-02-08 18:39:48 +00:00
Michael 0093f863fd Don't add already queued items from Diaspora to the queue again 2018-02-08 11:26:24 +00:00
Tobias Diekershoff 85c8bf0228
Merge pull request #4399 from MrPetovan/task/3878-move-include-bbcode-to-src
Move include/bbcode to src/ part 1 : Everything but bbcode()
2018-02-07 07:18:39 +01:00
Michael 47d165cb25 Hook calls can now be forked into a worker queue entry 2018-02-06 22:52:36 +00:00
Hypolite Petovan a62b46375d Move PROTOCOL_* constants to Model\Conversation 2018-02-05 14:09:03 -05:00
Hypolite Petovan a0cdd9c674 Rename Core\Network to Core\Protocol 2018-02-05 12:57:41 -05:00
Hypolite Petovan ddcbe75f15 Add deprecation documentation in boot.php 2018-02-04 19:40:06 -05:00
Hypolite Petovan b4651870db Add references to new methods and constants in include/bbcode
- Remove all private callback functions from include/bbcode
2018-02-04 19:25:22 -05:00
Hypolite Petovan f020292408 Remove references to include/datetime 2018-02-03 20:47:37 -05:00
Hypolite Petovan 876acd68a0
Merge branch 'develop' into task/3878-move-session-to-src 2018-02-03 11:59:43 -05:00
Hypolite Petovan 5518ef2fb4 Fix include/boot uses 2018-02-03 08:56:55 -05:00
Hypolite Petovan 5e7285b9ba Move Temporal::convert() to DateTimeFormat::convert() 2018-02-03 08:56:55 -05:00
Hypolite Petovan 89602e44da Add Temporal::timezoneNow() shorthand for Temporal::convert() 2018-02-03 08:56:53 -05:00
Hypolite Petovan b854905150 Move ATOM_TIME to Temporal::ATOM 2018-02-03 08:56:52 -05:00
Hypolite Petovan dc366bf1f7 Refactor datetime_convert into Temporal::convert
- Changed parameter order to save space
- Refactor select_timezone into Temporal::getTimezoneSelect
- Refactor field_timezone into Temporal::getTimezoneField
2018-02-03 08:56:51 -05:00
Hypolite Petovan d5753b21ae Switch to Core\Session
- Remove reference to include/session
- Use new Session::init()
- Prevent variable re-assignation if they're just empty
- Deprecate killme() function
- Correct DOMXPath class spelling
2018-02-03 08:40:18 -05:00
Michael 4949be60a8 Improved query speed 2018-02-01 00:29:47 +00:00
Adam Magness 0f1be37279 Remove old file
remove network.php and all require_once statements
2018-01-27 08:28:20 -05:00
Hypolite Petovan 30c1cc0e8c
Merge pull request #4312 from zeroadam/feature/L10n
Move pgettext to src
2018-01-24 11:48:55 -05:00
Hypolite Petovan d6bdaeaffe Add update function to reload addons after hook renaming 2018-01-23 18:57:51 -05:00
Michael 3fbc873ffe Birthdays are now transmitted reliably to Diaspora 2018-01-23 22:51:30 +00:00
Adam Magness f7e9b74dca Update function and sprintf
Update variable to static function and remove sprintf wrappers
2018-01-23 12:47:30 -05:00
Adam Magness f0725ae384 Hopefully all t()
hopefully the last of the t()
2018-01-22 18:03:26 -05:00
Adam Magness b4d0df18c5 Remove old file and requires
Remove pgettext.php and remove require_once calls
2018-01-22 18:03:26 -05:00
Michael 18ad2fb96d When RINO is set to a (now) invalid value, we set it to a valid one 2018-01-22 22:58:03 +00:00
Hypolite Petovan c53c2fffa5 [database] Add user.legacy_password field 2018-01-20 22:24:58 -05:00
Hypolite Petovan 391c591322 Add pwdreset_time field to user table 2018-01-20 18:06:58 -05:00
Adam Magness b86b04a81a Change plugin to addon
change the use of plugin to addon where appropriate.
2018-01-20 07:48:22 -05:00
Adam Magness 11cf36105c Update Addon functions and calls
Update function names and calls for Addon class.
2018-01-20 07:48:22 -05:00
Adam Magness 0f546f7f0f Update functions and calls
Update function names and scope. update calls.
2018-01-15 17:09:06 -05:00
Hypolite Petovan e36f2bb1fb Use short form array syntax everywhere
- Add short form array syntax to po2php.php generation
2018-01-15 14:07:17 -05:00
Adam Magness a01a8a06f2 Remove requires
remove requires_once statment
2018-01-14 21:26:07 -05:00
Michael 98edd826ac Increased database version 2018-01-14 15:14:16 +00:00
Michael 3c027699a5 Receive participation messages and processes them 2018-01-12 20:52:43 +00:00
Hypolite Petovan da9523ed23 Add maxwidth column to oembed table
- Match Caching key for OEmbed queries
2018-01-10 19:25:08 -05:00
Michael 90a00662ff The automatic database update had worked endlessly 2018-01-10 22:44:38 +00:00
Michael e12b6e01a2 Best "uid" for sending comments, refresh after commenting might work now 2018-01-07 17:14:43 +00:00
Hypolite Petovan 35a18f6825 Fix unused code in include (second pass) 2018-01-04 12:21:13 -05:00
Hypolite Petovan 3b23f89ca2 Fix unused code in include
- Fix local formatting
- Remove unused variable
- Fix unreached breaks
- Remove commented out code
- Add some documentation
2018-01-04 12:21:13 -05:00
Tobias Diekershoff 04589ecd38
Merge pull request #4092 from MrPetovan/task/3954-move-auth-to-src
Move auth to src
2018-01-04 18:06:42 +01:00
Hypolite Petovan 6e71a84075
Merge pull request #4160 from annando/community
We now are having a global items page
2018-01-04 11:50:45 -05:00
Hypolite Petovan 2a09af8bd0 Remove too strict parameter check in defaults() 2018-01-03 21:24:09 -05:00
Michael 3ffea2cd2c We now have a global page for all global entries from the network. 2018-01-03 13:27:43 +00:00
Hypolite Petovan 9a3e773a9a Merge branch 'develop' into task/3954-move-auth-to-src 2018-01-02 19:30:41 -05:00
Hypolite Petovan 585c00347d Fix PHP notices in boot, index and App
- Use defaults() with $_GET variables in boot
- Initialize $a before checking for object member in boot
- Initilialize the $_SESSION variable for backend mode in index
- Add member variable page_offset to App
2018-01-02 08:09:49 -05:00
Hypolite Petovan 49eda1e154 Add defaults() function 2018-01-02 08:09:49 -05:00
Hypolite Petovan e74dbb3693 Improve goaway legibility 2017-12-29 21:55:13 -05:00
Hypolite Petovan 2dc598ed5b Move login() to Login module
- Move nuke_session to include/security
- Remove mod/login
2017-12-29 21:55:13 -05:00
Michael 3fdfc2e425 Hopefully this is now clearer 2017-12-22 21:31:32 +00:00
Michael 00c6261dae Only include the update.php, when really needed 2017-12-22 14:56:40 +00:00
Michael 2e2a2b8040 Corrected wrong handling of the return value 2017-12-22 14:51:50 +00:00
Michael 1e7e83510a Old stuff had been removed from the update routine 2017-12-22 14:48:29 +00:00
Hypolite Petovan 57d888f3e7
Merge pull request #4106 from annando/registered-users
We now fetch the number of registered users
2017-12-19 07:31:21 -05:00
Hypolite Petovan b6f60c45aa Fix double login issue
- Removed session existence check in killme
- Changed returned value in session_write for empty data
2017-12-18 23:43:15 -05:00
Michael dab83c8b40 We now fetch the number of registered users 2017-12-18 23:58:18 +00:00
Hypolite Petovan 916236ce2f Fix docblocks types 2017-12-17 15:27:50 -05:00
Hypolite Petovan 6dbd68e0cb Remove redundant index
- Increase UPDATE_VERSION and DB_UPDATE_VERSION
2017-12-15 11:36:06 -05:00
Michael 2d7cd2daf4 "update" is enough 2017-12-14 22:18:53 +00:00
Michael 15d42de647 Class moved, changes applied 2017-12-14 21:13:02 +00:00
Michael 0457bd995f "system_unavailable.php" is unavailable now 2017-12-13 21:55:19 +00:00
Hypolite Petovan a42595a30c Move Object\Contact to Model\Contact 2017-12-07 23:56:12 -05:00
Michael Vogel 5747cfc79c
Revert "Move Objects to Model" 2017-12-08 05:21:51 +01:00
Hypolite Petovan 18d93cddf6 Move Object\Contact to Model\Contact 2017-12-07 09:04:24 -05:00
Michael 0608efc38a We've got no mood anymore 2017-12-07 07:01:55 +00:00
Adam Magness cadfef63c4 Update false evaluations
=== false and !== false to is_null where appropriate.
2017-12-06 14:57:06 -05:00
Michael 9ffde01fc1 DBClean now works with the conversation table as well 2017-12-05 21:30:38 +00:00
Adam Magness 2f0da29c75 Features to src
Move Features to class in Friendica\Content namespace. Update function calls and references.
2017-12-04 08:33:49 -05:00
Michael df89e0384d Added description to networks, renaming some network names 2017-12-03 13:26:52 +00:00
Michael 6f7510550d NETWORK_MAIL2 was never finished, so remove it as well 2017-12-03 09:19:58 +00:00
Hypolite Petovan b85c94a60d
Merge branch 'develop' into issue/3878-move-Contact-to-src 2017-11-19 18:09:14 -05:00
Hypolite Petovan ec02af593d Change called method names
- Add GlobalContact::getRandomUrl
- Rename Contact::getIdForURL
- Rename Diaspora::sendUnshare
- Remove unused parameter $self in Contact::terminateFriendship
2017-11-19 17:03:39 -05:00
Hypolite Petovan b92fc24ff0 Add Contact Object
- Add Profile Object
- Add User Model
- Add use statements
2017-11-19 16:55:28 -05: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
Michael 01362461cf poller.php is cleaned up, unneeded stuff has been removed 2017-11-18 11:01:01 +00:00
Michael 13f899542d dbupdate now moved as well 2017-11-18 07:31:33 +00:00
Michael 731ec347b1 Removed old template parser 2017-11-11 09:26:23 +00:00
Adam Magness 06c3af9b60 Move Cache to src
relocate the cache class to Friendica\Core namespace
2017-11-09 11:05:18 -05:00
Adam Magness 4ca68c7af0 Class file relocations
Issue #3878
2017-11-08 08:37:03 -05:00
Michael 737cc6f101 Missing "use" in boot.php 2017-11-08 13:03:41 +00:00
Adam Magness 8522c47353 Remove Includes
Removed references to include/config.php and include/probe.php and deleted the respective files.
2017-11-07 12:14:03 -05:00
Adam Magness 0dfa57948f Issue-#3873
Replace deprecated functions with new syntax.
2017-11-07 06:24:39 -05:00
Michael 1607527447 And some more 2017-11-06 15:40:27 +00:00
Michael 70c08dee1d Some more improvements 2017-11-05 15:28:55 +00:00
Michael 9039e60a06 proc_run is not needed anymore 2017-11-05 12:32:35 +00:00
Michael 478e363967 proc_run was replaced 2017-11-05 12:15:53 +00:00
Michael da212a28a2 New worker class that does all the work 2017-11-05 10:33:46 +00:00
Michael 7566464a58 Avoid warning "Failed to write session data" 2017-10-31 16:03:01 +00:00
Michael 6d1ba768ef Reverted some test 2017-10-25 04:47:04 +00:00
Michael 6396f92d9b Bugfix for "Index column size too large" 2017-10-25 04:44:45 +00:00
Tobias Diekershoff 576cc383b9 Version 3.6-dev for develop again 2017-10-16 10:31:37 +02:00
Tobias Diekershoff f4632319c0 Version 3.5.4 2017-10-16 10:27:24 +02:00
Tobias Diekershoff 1441abd15a Version 3.5.4-rc 2017-10-13 18:49:37 +02:00
Michael 225eea2ca6 Avoid undefined class variables 2017-10-11 14:52:08 +00:00
Tobias Diekershoff 54e1585c22 set version to 3.6-dev 2017-10-05 10:07:21 +02:00
Tobias Diekershoff 12b37ac596 Friendica Version 3.5.3 2017-10-05 10:05:01 +02:00
Michael 3354f01ed5 Doxygen and bugfix 2017-09-30 17:42:03 +00: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
Michael d691c2e621 Database structure call is now executed directly when it cannot be called via proc_run 2017-09-30 16:45:35 +00:00
Michael bd88179419 Add additional checks for the worker 2017-09-30 11:19:46 +00:00
Tobias Diekershoff 1e8fd425bd Version 3.5.3-rc 2017-09-20 17:42:45 +02:00
Michael 8d4736c942 OStatus: We can now process delete messages / better account detection 2017-09-17 08:01:22 +00:00
Michael 8e17be7225 Store conversation data 2017-09-10 21:56:05 +00:00
Michael 637eb0bfb4 Bugfix: Mails weren't sent 2017-09-08 15:14:33 +00:00
Michael 21d27c2124 Bugfix: You cannot be local and remote at the same time 2017-08-28 04:46:04 +00:00
Michael 5adfeb0bd5 App::get_baseurl is now replaced with System::baseUrl 2017-08-26 07:32:10 +00:00
Michael 3c24bed412 New class "System" 2017-08-26 06:04:21 +00:00
Michael b3e20b1685 New database version 2017-08-14 05:49:49 +00:00
Michael 1d8c91c478 Restructured "dba::exists" function 2017-08-12 08:55:50 +00:00
Michael 79fe249c54 Better use a wrapper 2017-07-22 06:43:04 +00:00
Michael 5d7e1e1a15 Use the realpath for the handling with (temporary) paths 2017-07-22 05:50:25 +00:00
Michael 2bad626be6 Bugfix: Signatures for likes hadn't been stored 2017-07-15 04:03:50 +00:00
Thomas Willingham 11c5f471af Fix/workaround weird load order issue. 2017-07-08 16:25:13 +01:00
Michael 526db18f5c Hopefully a fix for semaphore warnings and for the missing field in the workerqueue 2017-06-28 18:31:33 +00:00
Michael 4515c36f69 Semaphore based locking and hopefully the fix for the workerqueue 2017-06-28 04:53:11 +00:00
Michael ceaa191d8c Recurring had been executed only once - and then never again 2017-06-19 18:20:19 +00:00
Michael cf179188b6 Some more worker fine tuning 2017-06-17 13:58:18 +00:00
Michael 1932a6d634 Replaced "table lock" - it is not so good, it seems 2017-06-12 14:19:47 +00:00
Michael 2372ef7fd5 Locking seems to be better here 2017-06-12 12:28:48 +00:00
Michael 8be52424f5 Only check for stale processes every 5 minutes 2017-06-12 09:44:46 +00:00
Michael 06815f1a38 Merge remote-tracking branch 'upstream/develop' into 1706-worker-even-faster
Conflicts:
	include/poller.php
2017-06-11 07:49:34 +00:00
Michael 4f70682f7a Inherit the creation date 2017-06-11 07:41:38 +00: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
Michael 504ceb2d43 We should increase the database version number 2017-06-07 20:24:44 +00:00
Tobias Diekershoff 66458d7313 Merge pull request #3522 from annando/1706-lock
Some more poller speed and lock functionality
2017-06-07 09:29:54 +02:00
Tobias Diekershoff 36630daca6 added missing dash in version 2017-06-07 07:36:04 +02:00
Michael Vogel f4652d6e50 Merge branch 'develop' into 1706-lock 2017-06-06 14:16:00 +02:00
Michael 8d13751d40 Increased database version 2017-06-06 12:07:27 +00:00
Tobias Diekershoff 7fb4b1be12 Friendica version 3.5.3dev 2017-06-06 12:22:06 +02:00
Tobias Diekershoff e3f60fe706 Friendica version 3.5.2 2017-06-06 12:18:29 +02:00
Michael 8db079c65e Don't always fork the poller. 2017-06-05 06:08:26 +00:00
Michael 945d3cc048 The constant CURLE_OPERATION_TIMEDOUT isn't defined on older PHP versions 2017-06-03 19:46:19 +00:00
Tobias Diekershoff ec5a3c3440 Merge pull request #3514 from annando/worker-locking
Fixed locking behaviour for the worker
2017-06-03 11:02:50 +02:00
Michael 21eb9a4b2e Fixed locking behaviour for the worker 2017-06-03 07:25:01 +00:00
Hypolite Petovan cbd3edbc05 Update remaining "dir.friendi.ca" instances 2017-06-02 22:15:43 -04:00
Michael 696404739b Bugfix Diaspora: We exited with the wrong return values and the guid for messages was too short 2017-05-17 19:25:30 +00:00
Tobias Diekershoff 925b803ae8 set version to 3.5.2rc 2017-05-14 09:16:55 +02:00
Michael b907ad9dd8 dba is now used for writing the workerqueue as well 2017-05-12 16:25:44 +00:00
Hypolite Petovan 86cae070f2 Merge branch 'develop' into improvement/move-app-to-src-2 2017-05-07 12:58:11 -04:00
Michael 7a3bdbfc15 Wrong parameter for delete command 2017-05-07 08:12:36 +00:00
Michael 6a594ca8a9 Some useful unique indexes 2017-05-05 21:55:19 +00:00
Hypolite Petovan 4d12f1b014 Fix overzealous space addition 2017-05-03 22:41:59 -04:00
Hypolite Petovan 3437e73ae4 Yet more standards 2017-05-02 23:37:50 -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 b9b43e30e6 Delete queries are now split into chunks. 2017-05-01 17:42:37 +00:00
Michael 9d9909cf10 Some more places were we check now 2017-04-29 17:45:09 +00:00
Michael 715e15cbe1 There is now a memory limit for the poller 2017-04-29 17:36:46 +00:00
Michael 15355850f7 Set the database version 2017-04-27 20:47:52 +00:00
Michael 35dc56c9c2 Salmons with Mastodon seem to work now 2017-04-27 20:38:46 +00:00
Michael c0784f7301 New tables for conversations 2017-04-22 20:46:40 +00:00
Michael fef0fe2fb9 Issue 3358: The key length should now work on InnoDB and MyISAM 2017-04-21 21:26:05 +00:00
Michael 806f395724 Issue 3351: Check if resource was created 2017-04-18 17:17:15 +00:00
Alexandre Alapetite 62768a1bb4 Bump version to 1219
https://github.com/friendica/friendica/pull/3321#pullrequestreview-32528437
2017-04-16 15:23:57 +02:00
Michael 358aa1d7ef Database version updated 2017-04-14 22:34:01 +00:00
Alexandre Alapetite 325d3afe18 Bump DB version 2017-04-12 23:14:33 +02:00
Hypolite Petovan ca7c2bfa00 Ignore Activity Streams delete messages from Mastodon 2017-04-10 22:20:03 -04:00
Michael 47a6f6b726 Issue 3300: The temp path creation couldn't create a subdirectory with the hostname 2017-04-07 21:34:06 +00:00
Hypolite Petovan 1ab28bbe03 Add Text_Highlighter to Composer
- Fixes critical mistake in boot.php regarding set_include_path
- Fixes minor mistake in text.php regarding strpos order of arguments

Note: This change significantly increases Composer running time because
Text_Highlither is a PEAR package. I'm already planning to replace it
with scrivo/highlight.php.
2017-04-05 00:31:49 -04:00
Hypolite Petovan 9237b2611a Merge branch 'develop' into rewrites/coding-convention-split2 2017-04-03 06:35:27 -04:00
Michael Vogel d9451ef969 Merge pull request #3279 from Hypolite/improvement/add-composer
Add Composer
2017-04-02 14:57:37 +02:00
Roland Häder 49527b70d3 Merge branch 'develop' into rewrites/coding-convention-split2 2017-04-01 22:16:08 +02:00