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

20006 Commits

Author SHA1 Message Date
Tobias Diekershoff a49e094308 added forgotten trim 2018-07-06 15:49:27 +02:00
Tobias Diekershoff 72638acac3 admins can forbid some nicknames from being registered 2018-07-06 15:32:56 +02:00
Hypolite Petovan 36dadfe0d4
Merge pull request #5325 from nupplaphil/lock_followup 
Lock Abstraction FollowUp #5291
 2018-07-05 16:27:26 -04:00
Philipp Holzer 5a28ad7377
AbstractCacheDriver now working for each CacheDriver 2018-07-05 22:01:33 +02:00
Philipp Holzer 749b167fd9
AbstractCacheDriver now working for each CacheDriver 2018-07-05 21:54:20 +02:00
Philipp Holzer 34cea93a8b
Bugfixings for Cache-Lock 
- used wrong cachekey in set
- therefore added an abstraction to avoid wrong key concatenation
- forgot to increase the db-version to 1275
 2018-07-05 21:47:52 +02:00
Hypolite Petovan 3be013361e
Merge pull request #5291 from nupplaphil/lock_abstraction 
Lock abstraction
 2018-07-05 15:05:18 -04:00
Philipp Holzer e41e7d2edd
Fixings 
- fixed test for semaphore
- fixed some issues
- changed namespace in Tests back to "src/"
- changed namings
 2018-07-05 20:57:31 +02:00
Philipp Holzer 906bb25972
code standards / simplifications 2018-07-05 07:59:56 +02:00
Philipp Holzer 19209f6826
merged from develop and increased DB-version 2018-07-04 23:44:11 +02:00
Philipp Holzer aac94d1d74
Adding multihost - locking 
Adding Unit-Tests for it
 2018-07-04 23:37:22 +02:00
Hypolite Petovan bd1056a61e
Merge pull request #5324 from annando/issue-5322 
Fixes issue 5322 - events now again are having a plink
 2018-07-04 16:03:26 -04:00
Michael 176ab7130f Fixes issue 5322 - events now again are having a plink 2018-07-04 19:53:02 +00:00
Hypolite Petovan 0d48acfd17
Merge pull request #5323 from annando/unlike 
Fix unliking liked
 2018-07-04 15:18:19 -04:00
Michael f60da34357 Fix unliking liked 2018-07-04 19:07:53 +00:00
Philipp Holzer b07dfbb03f
Merge remote-tracking branch 'remotes/origin/develop' into lock_abstraction 2018-07-03 20:16:31 +02:00
Tobias Diekershoff 199361a562
Merge pull request #5317 from annando/ostatus-like 
Fix: Likes from OStatus got the gravity of comments
 2018-07-03 10:08:36 +02:00
Michael 9a9541809b Fix: Likes from OStatus got the gravity of comments 2018-07-03 04:58:34 +00:00
Hypolite Petovan a23a16bb04
Merge pull request #5316 from annando/fix-wall-to-wall 
Fix: Twitter reshares hadn't been shown as this
 2018-07-02 17:23:39 -04:00
Michael 80f9a45cba Fix: Twitter reshares hadn't been shown as this 2018-07-02 21:15:54 +00:00
Hypolite Petovan 8cae2583b6
Merge pull request #5315 from annando/item-improved 
Only use query conditions in user mode
 2018-07-02 14:55:09 -04:00
Michael 4b3ae6a862 Only use query conditions in user mode 2018-07-02 18:22:27 +00:00
Hypolite Petovan 64cea5ce43
Merge pull request #5313 from annando/magic-speed 
Use already fetched data for magiclink
 2018-07-02 05:29:44 -04:00
Michael Vogel 5d8f7ae52e
Merge pull request #5312 from tobiasd/20180702-cs 
CS translation update THX Aditoo
 2018-07-02 07:59:38 +02:00
Michael 717ca0b7eb Use already fetched data for magiclink 2018-07-02 05:41:55 +00:00
Tobias Diekershoff fef252736b CS translation update THX Aditoo 2018-07-02 07:04:43 +02:00
Hypolite Petovan 183c8fd7e2
Merge pull request #5311 from annando/item-file-category 
Post update script to move old content from the item table
 2018-07-01 16:58:44 -04:00
Michael 37bc19673d Empty owner and author data 2018-07-01 19:33:42 +00:00
Michael 38160a48b0 Post update script to move old content from the item table 2018-07-01 19:02:29 +00:00
Hypolite Petovan 8238afc70b
Merge pull request #5310 from annando/item-file-category 
Files/Categories aren't stored in the item table anymore
 2018-07-01 10:09:04 -04:00
Hypolite Petovan 6acb8368fa
Merge pull request #5309 from tobiasd/20180701-de 
update for DE translation
 2018-07-01 05:11:37 -04:00
Michael 32a639891f Improved logging for expired items 2018-07-01 09:08:58 +00:00
Tobias Diekershoff c2496ccc9d update for DE translation 2018-07-01 11:08:12 +02:00
Michael bffdf96d87 The "file" variable isn't stored anymore in the item table 2018-07-01 07:57:59 +00:00
Hypolite Petovan 8e55d3585f
Merge pull request #5308 from annando/diaspora-people 
Added support for internal Diaspora links to accounts
 2018-06-30 19:38:20 -04:00
Michael 1905242a16 Added support for internal Diaspora links to accounts 2018-06-30 22:37:44 +00:00
Hypolite Petovan 0c553150ea
Merge pull request #5305 from annando/item-tags 
Tags aren't stored in the item table anymore
 2018-06-30 17:50:55 -04:00
Michael 60dcdd0b27 Preparation for not storing the file field into the item table. 2018-06-30 21:15:24 +00:00
Michael Vogel 379f35d2d9
Merge pull request #5306 from tobiasd/20180630-upcoming2 
Label for the Events happening in the next 7 days was wrong
 2018-06-30 18:42:26 +02:00
Michael Vogel 8681b5b557
Merge pull request #5307 from tobiasd/20180630-doc 
added documentation of the groupedit_image_limit variable
 2018-06-30 18:41:40 +02:00
Tobias Diekershoff 8045fae706 added documentation of the groupedit_image_limit variable 2018-06-30 18:17:28 +02:00
Tobias Diekershoff bc3a569b2f Label for the Events happening in the next 7 days was wrong 2018-06-30 17:34:27 +02:00
Michael 5ba1427806 We don't store tags in the item table anymore 2018-06-30 15:21:32 +00:00
Michael 0ab9f2e265 Preparations to not store the tags in the item table anymore 2018-06-30 13:54:01 +00:00
Hypolite Petovan 96fedc2994
Merge pull request #5304 from hoergen/develop 
frio: new scheme Plusminus aims to minimize empty design spaces
 2018-06-30 09:02:05 -04:00
Hypolite Petovan 3227cd4207
Merge pull request #5302 from annando/language 
The detected language now moved to "item-content" as well
 2018-06-30 08:42:35 -04:00
hoergen eb5edad07a
Add files via upload 
frio: new scheme Plusminus aims to minimize empty design spaces
 2018-06-30 13:39:11 +02:00
Michael Vogel 70a2afad51
Merge pull request #5303 from tobiasd/20180630-credits 
regen credits
 2018-06-30 10:11:14 +02:00
Tobias Diekershoff bccd59d6c5 regen credits 2018-06-30 09:58:40 +02:00
Michael a8a189eec4 The detected language now moved to "item-content" as well 2018-06-30 05:18:43 +00:00