Michael Vogel
|
7f7fe1c332
|
Merge pull request #3060 from rabuzarus/20170102_-_frio_badge_z-index
Bugfix: Frio css - add z-index to badges
|
2017-01-02 18:16:49 +01:00 |
|
rabuzarus
|
5bef39189b
|
Bugfix: Frio css - add z-index to badges
|
2017-01-02 13:38:10 +01:00 |
|
Michael Vogel
|
77632ca3b0
|
Merge pull request #3059 from tobiasd/20170102-lang
DE / ES update of the translation
|
2017-01-02 10:37:56 +01:00 |
|
|
|
e301dc7607
|
ES translation of the core
|
2017-01-02 08:22:52 +01:00 |
|
|
|
e74cee1e42
|
DE translation of the core
|
2017-01-02 08:22:39 +01:00 |
|
|
|
72a0b8d3be
|
Merge pull request #3058 from annando/1701-diaspora-thread-reply
Diaspora mentions are now done correctly
|
2017-01-02 08:15:54 +01:00 |
|
|
|
9a6478b273
|
Don't be greedy.
|
2017-01-02 07:00:44 +00:00 |
|
Michael Vogel
|
a285292d46
|
Merge pull request #3057 from rabuzarus/20170101_-_fix_frio_poke_tpl
Bugfix: fix the frio poke template
|
2017-01-02 00:46:25 +01:00 |
|
|
|
db2d0e0095
|
removal of useless variable
|
2017-01-01 23:38:32 +00:00 |
|
|
|
79b5eb63db
|
Some more reverts
|
2017-01-01 23:37:29 +00:00 |
|
|
|
212f78386d
|
Deactivated the auto mention - we should do it differently.
|
2017-01-01 23:35:34 +00:00 |
|
|
|
8aaf09f9ee
|
Automatically add a Diaspora mention
|
2017-01-01 23:18:42 +00:00 |
|
|
|
8c579735f9
|
Diaspora: Add a mention when doing a thread reply
|
2017-01-01 21:21:16 +00:00 |
|
rabuzarus
|
885bd09598
|
Bugfix: fix the frio poke template
|
2017-01-01 22:05:24 +01:00 |
|
|
|
551aca5b85
|
Merge branch 'develop' into rewrites/dbm_is_result
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2016-12-31 17:59:42 +01:00 |
|
|
|
9ca789b952
|
Merge remote-tracking branch 'upstream/develop' into develop
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2016-12-31 17:59:14 +01:00 |
|
|
|
d671af2795
|
Merge pull request #3054 from annando/1612-diaspora
Events are now shared with Diaspora in separate fields
|
2016-12-31 11:57:33 +01:00 |
|
|
|
4053499c38
|
Enable caching wirh comments
|
2016-12-30 23:18:31 +00:00 |
|
|
|
93666b5a8d
|
Disable some features
|
2016-12-30 22:54:16 +00:00 |
|
|
|
66902c7956
|
We now also transmit Dislikes
|
2016-12-30 22:40:30 +00:00 |
|
|
|
7cf70b64b8
|
We now send the participation message as well.
|
2016-12-30 22:31:21 +00:00 |
|
|
|
d2df464d8c
|
added curly braces + fixed indenting according to code review by Hypolite
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2016-12-30 21:49:08 +01:00 |
|
|
|
bc9cb5e5f6
|
added curly braces + fixed indenting according to code review by Hypolite
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2016-12-30 21:48:09 +01:00 |
|
|
|
c30647e15e
|
Merge branch 'develop' into rewrites/dbm_is_result
|
2016-12-30 21:35:37 +01:00 |
|
|
|
d2280d4120
|
Merge remote-tracking branch 'upstream/develop' into develop
dbm::is_result() calls needed merge
Signed-off-by: Roland Haeder <roland@mxchange.org>
|
2016-12-30 21:33:41 +01:00 |
|
|
|
4928d00e22
|
Standard stuff
|
2016-12-30 10:03:02 +00:00 |
|
|
|
55ee80338f
|
Events are now shared with Diaspora.
|
2016-12-30 03:31:38 +00:00 |
|
|
|
5222bd2264
|
Merge remote-tracking branch 'upstream/develop' into 1612-diaspora
|
2016-12-29 23:29:01 +00:00 |
|
|
|
94977cca18
|
Events are now done.
|
2016-12-29 23:27:11 +00:00 |
|
|
|
51155d7716
|
Merge pull request #3047 from annando/1612-indexlength
New binary data fields to avoid index length problems
|
2016-12-29 19:11:54 +01:00 |
|
|
|
666eb2ddbd
|
Merge branch '1612-diaspora' of github.com:annando/friendica into 1612-diaspora
|
2016-12-29 17:13:07 +00:00 |
|
|
|
9af3f5b0da
|
Improved loggin
|
2016-12-29 17:11:59 +00:00 |
|
|
|
1490f2d3b7
|
Merge remote-tracking branch 'upstream/develop' into 1612-diaspora
|
2016-12-29 10:16:10 +00:00 |
|
Michael Vogel
|
1d0cb0f7d2
|
Merge pull request #3048 from ddorian1/develop
Fix test for static calls with PHP 7
|
2016-12-29 11:14:14 +01:00 |
|
Michael Vogel
|
d830f506f2
|
Merge pull request #3051 from ddorian1/const
Missing self befor class constants
|
2016-12-29 11:11:47 +01:00 |
|
Michael Vogel
|
c348dd6134
|
Merge pull request #3046 from rabuzarus/2016125_-_photo_albums_refresh
Update the photo albums cache on upload, album deletion or renaming
|
2016-12-29 11:08:16 +01:00 |
|
|
|
483f34c4ce
|
We now transmit event data as well
|
2016-12-29 03:13:57 +00:00 |
|
|
|
85fe631f2c
|
2792 is not solved
|
2016-12-28 19:49:16 +01:00 |
|
|
|
ca0e6cba02
|
Relaying of Diaspora comments now work with the new fields as well.
|
2016-12-28 13:30:55 +00:00 |
|
Johannes Schwab
|
aab21838a4
|
Missing self befor class constants
|
2016-12-28 13:14:03 +01:00 |
|
Michael Vogel
|
efd9623ff1
|
Merge pull request #3050 from tobiasd/20161227-adminpanel
for the fed stats it is better to have a >= then a = in the query
|
2016-12-28 04:25:46 +01:00 |
|
|
|
236c7805a4
|
for the fed stats it is better to have a >= then a = in the query
|
2016-12-27 17:53:59 +01:00 |
|
Johannes Schwab
|
8e2fc0f8a9
|
Fix test for static calls with PHP 7
|
2016-12-27 15:51:38 +01:00 |
|
|
|
6a511066c4
|
Threaded comments will now be transmitted
|
2016-12-27 14:37:48 +00:00 |
|
|
|
ce4c542e37
|
Support for threaded comments
|
2016-12-27 12:59:15 +00:00 |
|
|
|
39c674f9a0
|
updated database.sql
|
2016-12-26 23:44:21 +00:00 |
|
|
|
38fed9a77b
|
We should increase the database version as well ...
|
2016-12-26 06:02:14 +00:00 |
|
Hypolite Petovan
|
949507d688
|
Merge remote-tracking branch 'friendica/develop' into develop
|
2016-12-25 23:42:11 -05:00 |
|
rabuzarus
|
a6d7ad0755
|
Update cache on photo edit only when album name has changed
|
2016-12-26 02:41:00 +01:00 |
|
|
|
3ba1ac595f
|
New binary data fields to avoid index length problems
|
2016-12-25 21:04:10 +00:00 |
|
