Commit Graph

12117 Commits

Author SHA1 Message Date
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
Michael Vogel 7be0020da9 Merge remote-tracking branch 'upstream/develop' into 1603-scrape-alias 2016-03-30 12:47:48 +02:00
Michael Vogel 4a5a964d89 "Scrape" now respects the new url formats with "index.php" 2016-03-30 12:46:10 +02:00
Michael Vogel b93e1d73a1 New OStatus implementation 2016-03-30 12:43:15 +02:00
Tobias Diekershoff 1b64aadfcd Merge pull request #2418 from annando/1602-diaspora
New Diaspora implementation
2016-03-30 11:06:38 +02:00
Michael Vogel 4d668fac8b Not sure if that is correct ... 2016-03-29 17:54:36 +02:00
Michael Vogel f80f4f6a97 Some changed doxygen header stuff 2016-03-28 22:35:11 +02:00
Michael Vogel 3c24f43011 Guesss what? Yeah, some documentation 2016-03-28 22:21:14 +02:00
rabuzarus f4c890de8a Update README.md
some spaces
2016-03-28 16:49:01 +02:00
rabuzarus c48ca7afe3 Update README.md
Add screenshots for README
2016-03-28 16:42:32 +02:00
rabuzarus 65d37a8c20 first files - move to Version 0.1 2016-03-28 16:29:05 +02:00
Michael Vogel b6121a0009 And wow ... some more documentation 2016-03-28 00:06:46 +02:00
Michael Vogel 7e711d9d62 And some more doc stuff 2016-03-27 23:38:35 +02:00
Michael Vogel faa9b77a90 Some more small documentation stuff 2016-03-27 23:25:32 +02:00
Michael Vogel 16ef9f4940 Support for the new contact request data type 2016-03-25 00:49:18 +01:00
Michael Vogel 7e7cac19f6 Avoid a guid whith spaces. 2016-03-24 21:32:55 +01:00
Michael Vogel ec90a9e6ad Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-24 16:19:52 +01:00
Michael Vogel 7bf079d858 Some more documentation - again. 2016-03-24 15:59:53 +01:00
Michael Vogel 24afcdd5dd Scrape: Always take the first alias 2016-03-24 08:35:06 +01:00
Michael Vogel 7aae852fe0 Some more code cleaning 2016-03-23 22:12:08 +01:00
Tobias Diekershoff dcb8d51a4c Merge pull request #2423 from annando/1603-api-conversation
API: Support for the conversation api call from GNU Social
2016-03-23 14:53:27 +01:00
Michael Vogel 799ff77797 API: Support for the conversation api call from GNU Social 2016-03-23 10:24:01 +01:00
Michael Vogel ac35f8c756 If the message already exists then the message id should be returned 2016-03-23 09:22:59 +01:00
Michael Vogel 28dfaa694c Add OEmbed data to the body of reshares 2016-03-23 07:36:17 +01:00
Michael Vogel e8c07aaac6 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-23 06:59:20 +01:00
Tobias Diekershoff 430be22bb9 Merge pull request #2422 from annando/1603-oembed-object
Bugfix: Avoid warning with non object OEmbed data
2016-03-23 06:51:14 +01:00