friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
17,552 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

17552 Commits

Author SHA1 Message Date
Michael 2df44eb084 Liking of your own stuff wasn't possible/enable dislike for Diaspora 2018-01-18 20:16:14 +00:00
Hypolite Petovan 271f0629f0
Merge pull request #4274 from annando/signature-atuff 
Bugfix: The Diaspora signature wasn't stored by nested comments
 2018-01-18 14:50:23 -05:00
Michael b6f15ec5ce Bugfix: The Diaspora signature wasn't stored by nested comments 2018-01-18 19:38:51 +00:00
Hypolite Petovan 7eb637c6ea
Merge pull request #4271 from annando/last-child 
"last-child" is not used anymore
 2018-01-18 08:09:46 -05:00
Hypolite Petovan c69d60644f
Merge pull request #4264 from annando/item-delete 
There is now a new delete function in the item class
 2018-01-18 08:02:50 -05:00
Michael 034d46196f "last-child" is not used anymore 2018-01-18 06:54:44 +00:00
Michael Vogel 13059f5396
Merge pull request #4269 from MrPetovan/task/4265-move-base64-to-composer 
Move base64 to Composer
 2018-01-18 07:04:18 +01:00
Michael Vogel 9196b098c2
Merge pull request #4270 from tobiasd/20180118-fixDEdocs 
added link to update documentation to DE index. Followup on #4259
 2018-01-18 06:44:59 +01:00
Tobias Diekershoff 573f64db2d added link to update documentation to DE index. Followup on #4259 2018-01-18 05:59:44 +01:00
Hypolite Petovan 8704a36682 Remove js/webtoolkit.base64 2018-01-17 21:24:04 -05:00
Hypolite Petovan 0d9595d80a Update all references to webtoolkit.base64 2018-01-17 21:23:51 -05:00
Hypolite Petovan f32eb02929 Add bower/base64 to Composer 2018-01-17 21:23:03 -05:00
Hypolite Petovan b7a3b320e5 Remove unused jquery.htmlstream Javascript library 2018-01-17 21:22:42 -05:00
Michael Vogel a13ad278ef
Merge pull request #4259 from MrPetovan/task/4116-remove-vendor-from-git 
Remove vendor from git
 2018-01-18 01:02:55 +01:00
Michael 2d66242b4f The delete function is now changed to the new function 2018-01-17 23:22:01 +00:00
Michael 000e6457b4 Merge remote-tracking branch 'upstream/develop' into item-delete 2018-01-17 21:54:17 +00:00
Hypolite Petovan 12de1f9569 Remove orphan documentation pages 2018-01-17 15:31:25 -05:00
Hypolite Petovan f1e96a358d Update GitHub documentation page 
- Add composer install part
- Fix GitHub name capitalization
 2018-01-17 15:31:11 -05:00
Hypolite Petovan 379f93831f Add documentation about new array syntax 2018-01-17 15:30:47 -05:00
Hypolite Petovan 2b5bffecf4 Add Update documentation page 2018-01-17 15:30:34 -05:00
Hypolite Petovan ab90bd2dd1
Merge pull request #4262 from fabrixxm/frio-login 
Frio: restyle login page episode II • Attack of the Clones
 2018-01-17 11:28:53 -05:00
fabrixxm f51fda7911 fix for coding standars 2018-01-17 17:27:27 +01:00
Hypolite Petovan ca0a261e08
Merge pull request #4261 from annando/bugfix-process 
Avoid sql error in process handling
 2018-01-17 10:45:16 -05:00
Hypolite Petovan 4034daca08 Updated installer dependency to PHP 5.6 and ext-xml 
- Updated doc
 2018-01-17 10:35:54 -05:00
fabrixxm fc8e8feec1 Frio: add login background color admin option 2018-01-17 16:33:27 +01:00
fabrixxm 2c8bbea65d frio: tweak login template, fix style 
move lost pwd link and register to submit wrapper,
use flexbox for submit row in login form,
show register link as button
fix form label colors in mobile
 2018-01-17 16:01:34 +01:00
Michael fbb024d151 Avoid sql error in process handling 2018-01-17 14:10:30 +00:00
Michael 947a1b894f Wall postings need to be treated especially as well. 2018-01-17 14:09:24 +00:00
fabrixxm 9862194914 Frio: fix home page 
Add home.tpl, fix style with custom home.html, fix style with custom page content from addon
 2018-01-17 13:29:04 +01:00
fabrixxm 0aafdab810 Use template home.tpl for mod/home 2018-01-17 13:27:41 +01:00
Michael 2df5a14ce5 Delete could work now, needs testing 2018-01-17 07:08:49 +00:00
Michael 32c1c04a1c Merge remote-tracking branch 'upstream/develop' into item-delete 2018-01-17 06:12:11 +00:00
Michael Vogel a526573075
Merge pull request #4253 from MrPetovan/task/fix-scrutinizer-issues 
[Scrutinizer] App.php / Create Model\Process
 2018-01-17 07:08:51 +01:00
Hypolite Petovan c1c9a829fa Add missing include in Model\Process 2018-01-17 00:17:58 -05:00
Hypolite Petovan f193f01a7d Fix issues in changed files 
- Initializes $return in Process::insert
- Update the type hint of dba::fetch
- Remove unused $a parameter in worker_init()
- Fix uses
 2018-01-17 00:17:58 -05:00
Hypolite Petovan ad88b6e3af Fix issues in App.php 
- Fix formatting
- Add method visibility
- Remove unused properties
- Remove unused methods
- Remove unused parameters
- Fix implode parameter order (?!)
 2018-01-17 00:17:58 -05:00
Hypolite Petovan 78ac7afe9c Move process functions to Model\Process 
- Add start|endProcess functions to Core\Worker
 2018-01-17 00:17:58 -05:00
Hypolite Petovan 6fe64a5ac6 Fix references to text_highlighter css 2018-01-16 23:48:07 -05:00
Hypolite Petovan 9dfd81db47 Add composer install commands to documentation 2018-01-16 20:30:09 -05:00
Hypolite Petovan a908adb084 Add install instructions for Composer 2018-01-16 20:30:09 -05:00
Hypolite Petovan 6cbf44f4f6 Remove versioning from vendor folder 2018-01-16 20:30:09 -05:00
Hypolite Petovan 5a88215cab Update composer.json 
- Switch pear/Text_Highlighter to Github repository
- Add fxp/composer-asset-plugin dependency
 2018-01-16 20:30:08 -05:00
Hypolite Petovan 0db92ec50b Add vendor to .gitignore 2018-01-16 20:30:08 -05:00
Hypolite Petovan b699637ab7
Merge pull request #4260 from annando/item-shadow 
Transfer all item shadow functions to the item class
 2018-01-16 20:26:07 -05:00
Michael 3ecdbb6a59 Standards 2018-01-16 23:20:07 +00:00
Michael 63a4105a59 New item class function for delete 2018-01-16 23:16:53 +00:00
Michael f30275f6db Oh, standards ... 2018-01-16 22:46:20 +00:00
Michael c4d3ab6878 Transfer all item shadow functions to the item class 2018-01-16 22:23:19 +00:00
Hypolite Petovan 0c4d7cd1a1
Merge pull request #4258 from zeroadam/BugFixQueue-#4256 
Fix class name issue
 2018-01-16 09:04:43 -05:00
Adam Magness 5d8f798ef7 Fix class name issue 
use Model\Queue as QueueModel and update function calls.
 2018-01-16 08:49:08 -05:00