strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
18973 commits 2 branches 55 tags 148 MiB
Commit graph

726 commits

Author SHA1 Message Date
Tobias Diekershoff f63be91bd5
Revert "Moved .htconfig.php file & extracted Install business logic" 2018-04-21 16:28:22 +02:00
Philipp Holzer 334d392154 Merge remote-tracking branch 'origin/develop' into install_config 2018-04-21 14:23:49 +02:00
Philipp Holzer 346697d771 Moved .htconfig file 
Extracted install business functions to new Class `Install.php`
 2018-04-21 14:10:53 +02:00
Tobias Diekershoff da541513ad regenerated master messages.po file 2018-04-20 09:31:27 +02:00
Hypolite Petovan 2d9f32c3df Move dev executables from util/ to bin/dev/ 2018-04-07 09:00:52 -04:00
Tobias Diekershoff 0a47f73685 regenerated master messages.po file 2018-04-06 16:59:56 +02:00
Hypolite Petovan a88e5e3742 Updated messages.po 2018-04-04 23:11:17 -04:00
Tobias Diekershoff 421517c611 consistent use of terms in heading in the admin panel 2018-04-04 07:22:05 +02:00
Tobias Diekershoff 3ec4e28af6 updated the privacy statement text and added some headers to the functions 2018-04-03 06:55:25 +02:00
Tobias Diekershoff 01a1e1b451 regenerated master messages.po file 2018-04-02 18:50:27 +02:00
Tobias Diekershoff 399344a1f8 make sure that the VM has php-zip installed that is needed by composer 2018-03-29 12:06:16 +02:00
Tobias Diekershoff e4ff071e8b regenerated master messages.po file 2018-03-28 08:45:50 +02:00
Alexandre Alapetite e64196c7b3 Fix PHP cannot take a shell script 
Fix part of https://github.com/friendica/friendica/issues/4665
`php [shell file]` does not work, so use `php [php file]` instead.
`php bin/console.php` is more robust than e.g. `bin/console` which does
not work on Windows, or *nix systems without Bash
 2018-03-24 12:47:40 +01:00
Hypolite Petovan 241ed9a9cd
Merge pull request #4658 from fabrixxm/dev/update-vagrant 
Edits to Vagrant dev env part 3
 2018-03-23 15:40:20 -04:00
fabrixxm 3aa015d381
Merge pull request #4651 from MrPetovan/develop 
Update Develop with 3.6-rc changes
 2018-03-23 17:21:35 +01:00
fabrixxm f05e773a8c Dev env: fix admin email 2018-03-23 17:16:22 +01:00
fabrixxm dd37176a01 Fix Vagrant dev env 
- more consistent use of hostname
- use .local hostname instead of .dev . Looks like Firefox is more
  happy with a self-signed certificate on .local than .dev
- add friendica.local to altname in certificate
- run composer install while provisioning
 2018-03-23 16:12:11 +01:00
Hypolite Petovan 27d94023ee Merge branch 'master' into develop 2018-03-23 06:15:55 -04:00
Tobias Diekershoff 4d8d5ca6a5
Merge pull request #4630 from MrPetovan/task/4629-move-executable-to-bin 
Move executable scripts to bin/ (part 1)
 2018-03-19 15:05:53 +01:00
Hypolite Petovan 4622f42b1d Remove util/typo 
- Updated documentation
- Fixed typo in documenation
 2018-03-18 23:52:07 -04:00
Hypolite Petovan 05b6cf7559 Remove util/extract 
- Updated documentation
 2018-03-18 23:49:45 -04:00
Hypolite Petovan 2226ed2949 Remove util/po2php 
- Updated documentation
 2018-03-18 23:47:38 -04:00
Hypolite Petovan 2b2c676eca Remove util/php2po 
- Updated util/README
 2018-03-18 23:44:27 -04:00
Hypolite Petovan f6fcda2781 Remove util/maintenance 2018-03-18 23:40:56 -04:00
Hypolite Petovan d83491ae59 Remove util/global_community_silence 
- Update wrong comment block for Console\Maintenance
 2018-03-18 23:40:06 -04:00
Hypolite Petovan 32c86b12ae Remove util/global_community_block 2018-03-18 23:39:26 -04:00
Hypolite Petovan 11e6b6358b Remove util/docblox_errorchecker 2018-03-18 23:37:45 -04:00
Hypolite Petovan db013ce6ee Remove util/createdoxygen 2018-03-18 23:37:22 -04:00
Hypolite Petovan 3b75ea0028 Remove util/config* 
- Update Console\Config help text
 2018-03-18 23:36:24 -04:00
Hypolite Petovan 7cd3b5d629 Move util/run_xgettext.sh to bin/ 2018-03-18 23:27:41 -04:00
Hypolite Petovan 1c2deac7e5 Move scripts/worker.php to bin/ 2018-03-18 23:25:21 -04:00
Hypolite Petovan 3f71cdf8be Move util/composer.ohar to bin/ 2018-03-18 23:15:31 -04:00
Tobias Diekershoff c08c2bc37c regen credits 2018-03-18 07:42:16 +01:00
Tobias Diekershoff 4593ad5c92 regen credits 2018-03-17 07:22:22 +01:00
Hypolite Petovan 7e765199e8 Ensure Config::load() in scripts 2018-03-07 12:35:16 -05:00
Hypolite Petovan 354bec58c0 Ensure BaseObject::setApp() whenever App is instantiated 2018-03-07 12:34:47 -05:00
Tobias Diekershoff a2860023db regenerated master messages.po file 2018-03-05 16:38:01 +01:00
Tobias Diekershoff ac435126dd regenerated master messages.po file 2018-03-02 12:02:54 +01:00
Hypolite Petovan 9f21e7f34f Use default value for uid parameter in Contact::getIdForURL 2018-03-01 19:54:12 -05:00
Tobias Diekershoff 324a2939c7 regen master messages.po with new help text in settings 2018-02-26 17:52:40 +01:00
Tobias Diekershoff 0efbbe18bf make /tmp writeable in the Vagrant VM 2018-02-23 16:02:37 +01:00
Tobias Diekershoff 3b46e9f389 regen master messages.po after moving functionality from addon to core 2018-02-10 18:18:23 +01:00
Tobias Diekershoff 3ee201648a regen credits 2018-02-04 09:56:03 +01:00
Tobias Diekershoff 6362c655ec consistend community naming, regenerated messages for translators 2018-02-01 09:21:46 +01:00
Tobias Diekershoff eac3a21c57 regenerated master messages.po file 2018-01-31 07:11:19 +01:00
Hypolite Petovan cd392db078 Move js/ folder under view/ 
- Move library/cropper to view/js/cropper
- Move library/jquery-textcomplete to view/js/jquery-textcomplete
 2018-01-28 16:17:36 -05:00
Hypolite Petovan 6ef2fd56f7
Merge pull request #4328 from tobiasd/20180125-msg 
regenerated master messages.po file
 2018-01-25 11:22:53 -05:00
Adam Magness e5d020ff7c Eliminate double usage 
addons/addons is incorrect
 2018-01-25 08:05:23 -05:00
Tobias Diekershoff 224665adcb regenerated master messages.po file 2018-01-25 07:39:12 +01:00
Hypolite Petovan 113539e29a Make util/po2php executable 2018-01-24 16:55:09 -05:00