keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
21825 commits 4 branches 0 tags 179 MiB
Commit graph

763 commits

Author SHA1 Message Date
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
Hypolite Petovan
e51c4a38ad Fix util/php2po 
- Remove use
- Simplify object handling
- Fix wrong `|| die()` structure
 2018-01-24 16:54:52 -05:00
Hypolite Petovan
3e7f683533 Fix util/extract.php 
- Captures way more L10n::t(t) instances
- Add recursive search into `src/` folder
- Fix string capture with new sprintf-free syntax
 2018-01-24 16:53:57 -05:00
Adam Magness
56c3b3f653 Revert use statement 
no need to generate use statement
 2018-01-24 11:38:34 -05:00
Adam Magness
c9d74d6844 Add use to generated files 
add use for L10n to generated files
 2018-01-24 11:12:06 -05:00
Adam Magness
df7bdbfc66 More missed calls 
missed t() calls
 2018-01-24 10:19:58 -05:00
Adam Magness
ead9d86236 More t() 
Update more t() calls
 2018-01-22 18:03:26 -05:00
Adam Magness
3b0f69599e Updat tt() calls 
update function calls for tt()
 2018-01-22 18:03:26 -05:00
Adam Magness
c8ecc31405 Update functions and calls 
Update function names and calls.
 2018-01-22 18:03:26 -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
Hypolite Petovan
5bc7f4a442 Remove RINO2 and RINO3 2018-01-19 11:27:53 -05:00
Hypolite Petovan
de70007a46 Update RINO settings 2018-01-19 11:27:53 -05:00
Hypolite Petovan
0d9595d80a Update all references to webtoolkit.base64 2018-01-17 21:23:51 -05:00
Hypolite Petovan
b7a3b320e5 Remove unused jquery.htmlstream Javascript library 2018-01-17 21:22:42 -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
Tobias Diekershoff
628016f378 regenerated master messages.po file 
Signed-off-by: Tobias Diekershoff <tobias.diekershoff@gmx.net>
 2018-01-15 07:37:47 +01:00
Hypolite Petovan
a81dc7f5a8 Update Composer version 2018-01-14 19:01:08 -05:00
Michael
dfe11b1863 Silencing an account does work again 2018-01-11 23:56:33 +00:00
Hypolite Petovan
5fc4927764 Improve dba::selectFirst calls 
- Fix remaining $r[0] references
- Rename $r to meaningful names
 2018-01-11 03:43:57 -05:00
Hypolite Petovan
ae66bcaff3 Rename selectOne to selectFirst 2018-01-10 12:57:21 -05:00
Hypolite Petovan
da60893590 Replace dba::select(limit => 1) by dba::selectOne 
- Convert array declarations to new style
 2018-01-10 12:57:21 -05:00
Michael Vogel
f415ee64e7
Merge pull request #4074 from MrPetovan/task/update-composer 
Update Composer
 2017-12-16 04:08:37 +01:00
Hypolite Petovan
90f4aa36b6 Update Composer 
- Update Composer to version 1.5.5
- Update Mobile_Detect to version 2.8.28
- Update classmaps
 2017-12-15 22:02:22 -05:00
Michael
1e0c46e8a3 Deprecated file removed 2017-12-15 11:25:05 +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
Tobias Diekershoff
e614022634 added some x permissions to scripts 2017-12-05 07:21:21 +01:00
Hypolite Petovan
7bd0ab8360 Move includes around in global_community_block 2017-12-02 08:43:13 -05:00
Hypolite Petovan
8826ece55e Use Contact::getIdForURL instead of probing 
- Add change to mod/admin
- Add change to util/global_community_block
 2017-12-01 22:32:24 -05:00
Hypolite Petovan
de3fcb0065
Merge pull request #3974 from tobiasd/20171127-credits 
regen credits
 2017-11-27 13:28:28 -05:00
Hypolite Petovan
f983712269
Merge pull request #3973 from tobiasd/20171127-utilconfig 
config tool needed some touch up to work again
 2017-11-27 13:28:06 -05:00
Tobias Diekershoff
6f825c5db4 regen credits 2017-11-27 18:42:05 +01:00
Tobias Diekershoff
25c8db1625 config tool needed some touch up to work again 2017-11-27 18:27:57 +01:00
Tobias Diekershoff
67f75a3261 regenerated master messages.po file 2017-11-27 09:26:44 +01:00
Tobias Diekershoff
d459a825ae add Ratten to the special contributors who are not found in git and messages.po files 2017-11-26 10:58:15 +01:00
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