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

9685 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Diekershoff
4ad52a417a DE update to the strings 2015-04-08 12:06:05 +02:00
Michael Vogel
3195157b2e Merge pull request #1499 from tobiasd/20150407_lng 
CS, FR update to the strings
 2015-04-07 19:08:30 +02:00
Michael Vogel
5ceb8e76fd Merge pull request #1498 from ddorian1/develop 
Fix infinite scrolling with frost-mobile
 2015-04-07 15:24:12 +02:00
Johannes Schwab
107b495183 fix infinite scrolling with frost-mobile 2015-04-07 13:26:09 +02:00
Tobias Diekershoff
7ecc401b5c FR update of the strings 2015-04-07 09:07:04 +02:00
Tobias Diekershoff
52549dae7b CS update to the strings 2015-04-07 09:00:12 +02:00
fabrixxm
9b6922fa86 Merge pull request #1497 from tobiasd/20150407_HF_1460 
after pull 1460 all notifications got marked read
 2015-04-07 08:07:54 +02:00
Tobias Diekershoff
42ec9ad279 after pull 1460 all notifications got marked read 2015-04-07 07:47:15 +02:00
fabrixxm
73248f7dda allow to update generic subsets of tables 2015-04-06 21:03:11 +02:00
fabrixxm
11a83b2345 add new api dfrn/remoteauth 
allow 'user@server' as username in api_login()
 2015-04-06 21:03:11 +02:00
Tobias Diekershoff
3355d00082 Merge pull request #1486 from annando/1504-like-on-comment 
Liking of "red" comments is now possible
 2015-04-06 14:09:53 +02:00
Michael Vogel
539a93b3f1 The timestamp was at the wrong place 2015-04-06 13:49:57 +02:00
Michael Vogel
5e2c93e80c Merge remote-tracking branch 'upstream/develop' into 1503-load-issues 2015-04-06 13:30:22 +02:00
Michael Vogel
1048be1dd0 Liking of "red" comments is now possible. 2015-04-06 13:22:19 +02:00
Tobias Diekershoff
81901f39e5 Merge pull request #1484 from annando/1504-bugfix-sql-warning 
Bugfix: Avoid SQL warnings because of empty id list
 2015-04-06 12:56:03 +02:00
Tobias Diekershoff
95c58e59d3 Merge pull request #1485 from annando/1504-diaspora-plink 
Diaspora: Central "plink" function
 2015-04-06 12:55:38 +02:00
Michael Vogel
4768c6c6b6 Diaspora: Central "plink" function 2015-04-06 12:26:31 +02:00
Michael Vogel
739219278b Avoid SQL warnings because of empty id list. 2015-04-06 10:12:37 +02:00
Tobias Diekershoff
fa948df062 Merge pull request #1483 from annando/1504-api-upload-pictures 
API: New picture upload function (Enhanced Twidere support)
 2015-04-06 07:23:42 +02:00
Michael Vogel
3cbd72d907 API: New picture upload function (Enhanced Twidere support) 2015-04-06 03:19:12 +02:00
Tobias Diekershoff
8ae90035f4 Merge pull request #1480 from annando/1504-diaspora-enhancement 
Diaspora uses this to fetch single public items
 2015-04-05 21:24:21 +02:00
Tobias Diekershoff
040976c77f Merge pull request #1481 from annando/1504-new-share-function 
New central function for the "share" header
 2015-04-05 21:21:14 +02:00
Michael Vogel
cdebdc777e Removed test logger 2015-04-05 21:06:32 +02:00
Michael Vogel
32206cd681 Diaspora uses this to fetch single public items. 2015-04-05 20:50:15 +02:00
Michael Vogel
57528cb987 New function for building the "share" header 2015-04-05 20:43:06 +02:00
Michael Vogel
aea83f0bec The order for the page parsing is changed. 2015-04-05 20:40:31 +02:00
Tobias Diekershoff
a4afebb796 Merge pull request #1477 from dc5ala/master 
Just a few typos fixed I've seen
 2015-04-05 14:51:48 +02:00
André Lohan
d5fbe3a7b6 fixes a few typos 2015-04-05 13:20:15 +02:00
Tobias Diekershoff
106b0b5d23 Merge pull request #1460 from FlxAlbroscheit/develop 
Issue 1163: Feature allowing desktop-notifications
 2015-04-05 11:37:05 +02:00
fabrixxm
a91a352089 Merge branch 'release/3.4' into develop 2015-04-05 11:07:22 +02:00
fabrixxm
bf28cc0f75 Merge branch 'release/3.4' 2015-04-05 11:05:30 +02:00
Michael Vogel
9fda2d4d3b Merge pull request #1476 from fabrixxm/changelog 
update CHANGELOG
 2015-04-05 10:38:49 +02:00
fabrixxm
b00fe54b05 update CHANGELOG 2015-04-05 10:30:57 +02:00
fabrixxm
ab5540e1f0 Merge pull request #1474 from fabrixxm/silke-helptext 
Connection approval help text, issue #1349, based on pull request #1463
 2015-04-05 10:23:19 +02:00
fabrixxm
2d3437daa3 different help text for different network 2015-04-04 18:02:26 +02:00
fabrixxm
bb7406643b Merge branch 'helptext' of https://github.com/silke/friendica into silke-helptext 2015-04-04 17:42:23 +02:00
Michael Vogel
4771fc16a9 Merge pull request #1473 from tobiasd/20150403doc 
small updates to the developer intro doc
 2015-04-03 22:10:33 +02:00
Tobias Diekershoff
e8df044080 small changes to the developer intro doc 2015-04-03 19:47:14 +02:00
fabrixxm
1523aecebd Merge pull request #1472 from annando/issue-1063 
The unseen marker is now set according to the api output
 2015-04-03 15:07:56 +02:00
Michael Vogel
e9a2cf7a91 The unseen marker is now set according to the query that is used for the home timeline. 2015-04-03 14:58:42 +02:00
fabrixxm
d0b925f95f Merge pull request #1471 from annando/markdown-shared-posts 
Diaspora/Libertree: problems with repeated posts
 2015-04-03 13:56:27 +02:00
Michael Vogel
796b13673d Reshared posts weren't always recognized as such. 2015-04-03 13:06:19 +02:00
Michael Vogel
7c0c56d20b The conversion of Repeated posts to markdown had a problem with a missing linefeed before the quote. 2015-04-03 12:37:29 +02:00
Michael Vogel
1cacf64724 Merge pull request #1469 from fabrixxm/changelog 
Update codename and CHANGELOG
 2015-04-02 23:14:40 +02:00
fabrixxm
84ed4ef82f Update CHANGELOG 2015-04-02 22:18:59 +02:00
fabrixxm
341622b484 Merge pull request #1468 from tobiasd/20150402lng 
DE update to the strings
 2015-04-02 22:17:35 +02:00
fabrixxm
c1d683b5b7 Merge pull request #1467 from annando/issue-1306 
Events from the past aren't shown anymore (hopefully)
 2015-04-02 22:17:12 +02:00
fabrixxm
f93e9751b8 Update codename and CHANGELOG 2015-04-02 22:05:52 +02:00
Tobias Diekershoff
415960a31a DE update to the strings 2015-04-02 21:34:59 +02:00
Tobias Diekershoff
33952e5f1d DE update to the strings 2015-04-02 18:23:27 +02:00