1
0
Fork 0
Commit graph

14024 commits

Author SHA1 Message Date
65226778fe More standards 2017-01-09 06:40:56 +00:00
fc60e7f5dd Making Hypolite smile 2017-01-08 22:29:55 +00:00
906c7d528b Bugfix: Answers to OStatus posts should never reach Diaspora 2017-01-08 20:35:41 +00:00
28b2e599fb it should be "gid" not "cid" 2017-01-08 20:11:15 +00:00
f14cd2920a database.sql was updated 2017-01-07 22:04:57 +00:00
ed0143c9f0 Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-07 16:13:57 +00:00
Michael Vogel
ee39aba490 Merge pull request #3043 from Quix0r/rewrites/dbm_is_result
More usage of dbm::is_result + coding convention applied
2017-01-07 17:09:23 +01:00
Michael Vogel
b7d675dbb0 Merge pull request #3071 from Hypolite/issue/#1034-2
Updated SSL english docs
2017-01-07 15:40:24 +01:00
1febf182ad Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-07 14:31:25 +00:00
c2543f918b Last minutes changes 2017-01-07 13:52:30 +00:00
Hypolite Petovan
3caf3bccd9 Updated SSL english docs
Fixes #1034
2017-01-07 23:27:50 +11:00
Hypolite Petovan
8d195dc499 Merge remote-tracking branch 'friendica/develop' into develop 2017-01-07 23:23:50 +11:00
1b48799f08 Don't do queries if not needed 2017-01-07 11:28:18 +00:00
414c5ddae0 Use Config class/Option to deactivate the count on albums 2017-01-07 09:05:52 +00:00
f1dc36978a Merge branch 'develop' into rewrites/dbm_is_result 2017-01-07 09:24:07 +01:00
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
770816a62a Merge branch 'develop' into rewrites/dbm_is_result 2017-01-06 17:11:07 +01:00
4530f4ac9d Merge remote-tracking branch 'upstream/develop' into develop 2017-01-06 17:10:40 +01:00
cb5df4d715 Some corrections 2017-01-06 13:30:12 +00:00
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
6976ad4892 Removed some removed indexes 2017-01-06 06:37:27 +00:00
58c229031e Now for the database version 2017-01-05 22:56:49 +00:00
ff3728be47 Cleaning up the stuff 2017-01-05 22:51:31 +00:00
2deb2b637b Some new indexes and some removed. 2017-01-05 22:23:00 +00:00
6cdccbe2f6 Will we now find the best index fort the contact? 2017-01-05 17:48:51 +00:00
7aaf91a620 Removing and adding some indexes 2017-01-05 13:16:27 +00:00
9c7a2d2f9a Another index 2017-01-05 09:32:16 +00:00
a4e437b56f Contact testing 2017-01-05 09:10:02 +00:00
a92c5f464d Hopefully this it it ... 2017-01-05 08:02:21 +00:00
624c5fd190 Merge branch 'develop' into rewrites/dbm_is_result 2017-01-05 08:56:39 +01:00
cbc32143d7 Merge remote-tracking branch 'upstream/develop' into develop 2017-01-05 08:56:05 +01:00
db1c6c06d6 Finding the best index ... 2017-01-05 07:30:10 +00:00
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
cefb36fb67 Some more indexes on the contact table 2017-01-04 23:28:51 +00:00
c221376041 Some notification thingy 2017-01-04 23:12:28 +00:00
44d966574d Some more indexes and other query improvements 2017-01-04 19:13:50 +00:00
6b6e3e264f Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-04 13:57:27 +00:00
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
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
91d9ac0d1e Merge branch 'develop' into rewrites/dbm_is_result 2017-01-04 09:04:51 +01:00
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