Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-27 06:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity
14572 commits 3 branches 64 tags 241 MiB
Commit graph

14572 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
414c5ddae0 Use Config class/Option to deactivate the count on albums 2017-01-07 09:05:52 +00:00
Roland Häder
f1dc36978a Merge branch 'develop' into rewrites/dbm_is_result 2017-01-07 09:24:07 +01:00
Roland Häder
4f25396fae Merge remote-tracking branch 'upstream/develop' into develop 2017-01-07 09:23:58 +01:00
Michael Vogel
98c5eb1d95 Merge pull request #3068 from rabuzarus/20170105_-_frio_mobile_theme_selection 
Frio: Show mobile theme selection only if mobile themes are available
 2017-01-07 03:00:38 +01:00
rabuzarus
898761b4a0 Show mobile theme selection only if mobile themes are available (default template) 2017-01-07 00:22:22 +01:00
Roland Häder
770816a62a Merge branch 'develop' into rewrites/dbm_is_result 2017-01-06 17:11:07 +01:00
Roland Häder
4530f4ac9d Merge remote-tracking branch 'upstream/develop' into develop 2017-01-06 17:10:40 +01:00
Michael
cb5df4d715 Some corrections 2017-01-06 13:30:12 +00:00
Michael
680b16d036 Added documentation 2017-01-06 07:03:35 +00:00
Michael Vogel
0d32fce2df Merge pull request #3067 from rabuzarus/20170105_-_fix_dfrn_doxygen_todos 
Bugfix: make some todos usable for doxygen in dfrn.php
 2017-01-06 07:52:34 +01:00
Michael
6976ad4892 Removed some removed indexes 2017-01-06 06:37:27 +00:00
Michael
58c229031e Now for the database version 2017-01-05 22:56:49 +00:00
Michael
ff3728be47 Cleaning up the stuff 2017-01-05 22:51:31 +00:00
Michael
2deb2b637b Some new indexes and some removed. 2017-01-05 22:23:00 +00:00
Michael
6cdccbe2f6 Will we now find the best index fort the contact? 2017-01-05 17:48:51 +00:00
Michael
7aaf91a620 Removing and adding some indexes 2017-01-05 13:16:27 +00:00
Michael
9c7a2d2f9a Another index 2017-01-05 09:32:16 +00:00
Michael
a4e437b56f Contact testing 2017-01-05 09:10:02 +00:00
Michael
a92c5f464d Hopefully this it it ... 2017-01-05 08:02:21 +00:00
Roland Häder
624c5fd190 Merge branch 'develop' into rewrites/dbm_is_result 2017-01-05 08:56:39 +01:00
Roland Häder
cbc32143d7 Merge remote-tracking branch 'upstream/develop' into develop 2017-01-05 08:56:05 +01:00
Michael
db1c6c06d6 Finding the best index ... 2017-01-05 07:30:10 +00:00
Michael
00d7835ba6 Some more contact indexes 2017-01-05 07:12:13 +00:00
rabuzarus
0994a0ced5 Frio: Show mobile theme selection only if mobile themes are available 2017-01-05 02:52:39 +01:00
rabuzarus
686a7dbe01 Bugfix: make some todos usable for doxygen in dfrn.php 2017-01-05 02:23:34 +01:00
Michael
cefb36fb67 Some more indexes on the contact table 2017-01-04 23:28:51 +00:00
Michael
c221376041 Some notification thingy 2017-01-04 23:12:28 +00:00
Michael
44d966574d Some more indexes and other query improvements 2017-01-04 19:13:50 +00:00
Michael
6b6e3e264f Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-04 13:57:27 +00:00
Tobias Diekershoff
0c65dbb8db Merge pull request #3064 from rabuzarus/20170102_-_add_switch_element_to_frio 
Frio: implement On/Off switcher element
 2017-01-04 13:54:48 +01:00
Tobias Diekershoff
8f0ca51a55 Merge pull request #3065 from rabuzarus/20170103_-_frio_fix_nav_help_string 
Bugfix: Frio - use "Help" instead of "Help And Documentation" as label in the nav user menu
 2017-01-04 13:52:51 +01:00
Roland Häder
91d9ac0d1e Merge branch 'develop' into rewrites/dbm_is_result 2017-01-04 09:04:51 +01:00
Roland Häder
42c2e09382 Merge remote-tracking branch 'upstream/develop' into develop 2017-01-04 09:03:00 +01:00
rabuzarus
e31c4a62aa Merge pull request #3063 from tobiasd/20170103-de 
DE translations THX Rabuzarus
 2017-01-03 17:53:17 +01:00
rabuzarus
995e1fe690 Bugfix: Frio - use "Help" instead of "Help And Documentation" as label in the nav user menu 2017-01-03 17:49:40 +01:00
rabuzarus
860d6d51b9 Frio: add "aria-describedby" to the field templates 2017-01-03 17:38:08 +01:00
rabuzarus
96dfd22d9d Frio: implent switcher element 2017-01-03 17:33:01 +01:00
Tobias Diekershoff
b783a98a9f DE translations THX Rabuzarus 2017-01-03 10:42:11 +01:00
Hypolite Petovan
93ea37e016 Merge remote-tracking branch 'friendica/develop' into develop 2017-01-03 09:11:05 +11:00
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
Tobias Diekershoff
e301dc7607 ES translation of the core 2017-01-02 08:22:52 +01:00
Tobias Diekershoff
e74cee1e42 DE translation of the core 2017-01-02 08:22:39 +01:00
Tobias Diekershoff
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
Michael
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
Michael
db2d0e0095 removal of useless variable 2017-01-01 23:38:32 +00:00
Michael
79b5eb63db Some more reverts 2017-01-01 23:37:29 +00:00
Michael
212f78386d Deactivated the auto mention - we should do it differently. 2017-01-01 23:35:34 +00:00