clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,343 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

12343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Diekershoff f27cadae8d Merge pull request #2442 from annando/1604-api 
API: Improvement for Twidere/Conversation call improved
 2016-04-10 06:37:33 +02:00
Michael Vogel 34dc23b871 API: Improvement for Twidere/Conversation call improved 2016-04-09 22:44:32 +02:00
fabrixxm 0370a2e6f3 Merge pull request #2440 from tobiasd/issue2241 
Issue 2241: added language selector to the admin wizard
 2016-04-08 10:41:36 +02:00
Tobias Diekershoff dfa5183774 Merge pull request #2441 from rabuzarus/0704_doxygen_forum 
Update ForumManager.php
 2016-04-07 21:06:32 +02:00
rabuzarus d5bf386cf7 Update ForumManager.php - small correction 2016-04-07 16:58:26 +02:00
rabuzarus a3c79d2007 Update ForumManager.php 
fix some doxygen description
 2016-04-07 14:43:56 +02:00
Tobias Diekershoff ac9d392264 make en the default language 2016-04-06 20:21:41 +02:00
Tobias Diekershoff a28372c032 intendation... 2016-04-06 20:18:33 +02:00
Tobias Diekershoff 5df20fda11 Issue 2241: added language selector to the admin wizard 2016-04-06 20:13:34 +02:00
fabrixxm 295489e9a5 Merge pull request #2434 from tobiasd/20160403-lng 
lang info in HTML header
 2016-04-06 09:04:13 +02:00
Tobias Diekershoff 9d2864fc58 Merge pull request #2437 from annando/1604-session 
"remember me" in session does work now
 2016-04-06 08:08:21 +02:00
Michael Vogel 952f8514a5 "remember me" in session does work now 2016-04-05 23:28:33 +02:00
fabrixxm ff886bbaca Merge pull request #2435 from tobiasd/20160404-login 
added aria describedby elements to input templates
 2016-04-04 08:47:19 +02:00
Tobias Diekershoff 1ee405c9c3 added aria describedby elements refering to field help to the input templates 2016-04-04 08:10:27 +02:00
Tobias Diekershoff d9b6355bb8 added lang info to frost themes 2016-04-03 21:00:18 +02:00
Tobias Diekershoff a88d950c33 set language in HTML header to selected UI language 2016-04-03 20:55:39 +02:00
Tobias Diekershoff b9d9ffbd01 Merge pull request #2429 from annando/1604-item-shadow 
New post update function, search is now using the "global" field
 2016-04-03 19:55:34 +02:00
Tobias Diekershoff 477614df26 Merge pull request #2431 from annando/1604-scrape-profile 
Scrape: Changed detection for the profile link
 2016-04-03 19:52:23 +02:00
Michael Vogel 1f61efc7fe Scrape: Changed detection for the profile link 2016-04-03 19:29:35 +02:00
Michael Vogel 3fdaafd54a Some more documentation 2016-04-03 18:49:41 +02:00
Michael Vogel 47563d34ee Merge remote-tracking branch 'upstream/develop' into 1604-item-shadow 2016-04-03 18:46:14 +02:00
Tobias Diekershoff 945652b24a Merge pull request #2430 from annando/issue-2247 
issue 2247: Update more fields when relocation the server
 2016-04-03 18:34:38 +02:00
Michael Vogel 94e8139c7e issue 2247: Update more fields when relocation the server 2016-04-03 18:18:36 +02:00
Michael Vogel f192767d7a Some reverted stuff 2016-04-03 16:38:32 +02:00
Michael Vogel 9f57425d08 Post update ist now done. 2016-04-03 16:36:05 +02:00
rabuzarus 863da63c56 first fix for mobile nav user menu (needs more work) 2016-04-03 15:07:13 +02:00
rabuzarus a5f0ea93d9 workaround for topbar-second dropdown menu on mobile 2016-04-03 14:51:02 +02:00
rabuzarus 189e34a26d Merge new into orig 2016-04-03 14:11:18 +02:00
rabuzarus 9aa8451279 change the stream width (col-lg-7) 2016-04-03 14:06:13 +02:00
Michael Vogel beb1e04069 New field in item table ("shadow") that indicates if there is a shadow entry 2016-04-03 13:48:31 +02:00
Tobias Diekershoff 2172384d4f Merge pull request #2428 from annando/1604-parent-like 
Small bugfix: We always liked the parent instead of the child
 2016-04-02 18:07:07 +02:00
Michael Vogel ce2c1b4fc1 Small bugfix: We always liked the parent 2016-04-02 17:43:53 +02:00
Tobias Diekershoff 4a3a63dfc1 Merge pull request #2427 from annando/1604-salmon-like 
OStatus: Likes do work more reliable, alias should be okay now
 2016-04-02 16:33:19 +02:00
Michael Vogel 68b88c0384 Notify and poll aren't fetched at the moment 2016-04-02 15:49:57 +02:00
Michael Vogel b4b62493e6 Bugfix: The nickname vanished/better way to fetch the alias 2016-04-02 15:41:55 +02:00
Michael Vogel e5377a5e91 Merge remote-tracking branch 'upstream/develop' into 1604-salmon-like 2016-04-02 14:12:02 +02:00
Michael Vogel fd965b046a Update contact data for uid=0 at feed import 2016-04-02 14:10:40 +02:00
Tobias Diekershoff c30306e085 Merge pull request #2424 from annando/1603-scrape-alias 
Scrape: Always take the first alias
 2016-04-02 09:48:31 +02:00
Michael Vogel bc05984786 Only update contact when scrape runs with "probe_normal" 2016-04-02 09:06:10 +02:00
Michael Vogel 08fb662b4a OStatus: Salmon now works with "likes"/The alias is stored now as well 2016-04-02 00:24:56 +02:00
Michael Vogel eeb462cd04 Only update the contact entry with uid=0 2016-04-01 21:41:37 +02:00
Tobias Diekershoff d4fd01e25e Merge pull request #2426 from annando/1604-cron-optimize 
Don't optimize the tables when the maximum size is lower than zero
 2016-04-01 21:26:12 +02:00
Michael Vogel 416a0e5ec2 Don't optimize the tables when the maximum size is lower than zero 2016-04-01 21:09:52 +02:00
Tobias Diekershoff d523a809a2 Merge pull request #2425 from annando/1603-ostatus 
OStatus is now a class - and reshare and like seems to work
 2016-04-01 07:13:29 +02:00
Michael Vogel ffcc5f372f Some more documentation 2016-03-31 22:24:54 +02:00
Michael Vogel d0b8f2092d Some more documentation 2016-03-31 22:01:56 +02:00
Michael Vogel ffd73d137b Added some documentation 2016-03-31 07:34:13 +02:00
Michael Vogel 6ff5c23d50 Doxygen structure added 2016-03-31 00:14:51 +02:00
Michael Vogel 1f2c495cd8 Tempory file is deleted 2016-03-30 23:26:37 +02:00
Michael Vogel 2c5b5c1cd4 OStatus class is now moved into the right place 2016-03-30 23:25:20 +02:00