clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,502 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

11502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Diekershoff 0905f18c0f allow -rc in friendica version listings 2016-01-15 18:19:20 +01:00
Tobias Diekershoff ce39992875 combine some versions for ~f and D* 2016-01-15 18:19:20 +01:00
Tobias Diekershoff 25bb977b87 better names for some variable to reflect their intention 2016-01-15 18:19:20 +01:00
Tobias Diekershoff 4af584cec2 small fix for the ShaShape font 2016-01-15 18:19:20 +01:00
Tobias Diekershoff a4104d7c17 1st stuff for federation stats in the admin panel 2016-01-15 18:19:19 +01:00
Michael Vogel 471963a142 Merge remote-tracking branch 'upstream/develop' into 1601-network-performance 2016-01-15 08:33:21 +01:00
Tobias Diekershoff a0f3fe6fde Merge pull request #2251 from annando/1601-plaintext 
Twitter shortening should now work when the shortening is in the link
 2016-01-15 07:11:16 +01:00
Michael Vogel 268467fe04 Add the creation date to the cache tables 2016-01-15 00:58:57 +01:00
Michael Vogel d5e1f33506 OEmbed and parse_url are now cached in dedicated tables 2016-01-14 23:59:51 +01:00
Michael Vogel c4ba035ee3 Add some analysing stuff, rendered value is written now more often 2016-01-14 21:56:37 +01:00
Michael Vogel 9b5c6ed580 Twitter shortening should now work even the shortening would be in the link 2016-01-14 19:38:59 +01:00
fabrixxm f4173d1764 Merge pull request #2244 from annando/1601-gcontact-total 
Global contacts are now playing a central role
 2016-01-14 10:14:52 +01:00
fabrixxm 84016b2ca9 Merge pull request #2250 from rabuzarus/1301_vier_mobile_break 
vier: mobile view - fix word breaking
 2016-01-14 09:50:31 +01:00
rabuzarus 556f76de01 vier: mobile view - fix word breaking 2016-01-13 19:56:21 +01:00
Michael Vogel 86da77e8ee Added two to-dos to do. 2016-01-13 10:53:38 +01:00
Michael Vogel d1d7ab799c Added some more documentation 2016-01-11 20:21:42 +01:00
Michael Vogel 012107f5f7 Table documentation added 2016-01-11 20:17:31 +01:00
Michael Vogel 01c2eacd46 Merge remote-tracking branch 'upstream/develop' into 1601-gcontact-total 2016-01-11 14:25:48 +01:00
Michael Vogel 941b5fd11e Some added logging 2016-01-11 14:24:54 +01:00
fabrixxm bf9997b91d Merge pull request #2245 from annando/1601-diaspora-post 
Bugfix: Public posts to Diaspora could fail
 2016-01-11 14:22:31 +01:00
fabrixxm 8c52bb3f44 Merge pull request #2248 from tobiasd/20160111-htconfig 
remove unsupported themes from list of allowed themes
 2016-01-11 09:01:50 +01:00
Tobias Diekershoff 5c568df9a6 remove unsupported themes from list of allowed themes 2016-01-11 08:57:51 +01:00
Michael Vogel 338fa5765c Merge pull request #2246 from tobiasd/20160111-newhere 
don't mention FB in newhere tipps
 2016-01-11 08:30:33 +01:00
Tobias Diekershoff bfdbc0c818 don't mention FB in newhere tipps 2016-01-11 07:54:52 +01:00
Michael Vogel 8d9a905c80 Bugfix: Public posts to Diaspora could fail 2016-01-10 23:08:25 +01:00
Michael Vogel 6b85fa17bb Added some documentation 2016-01-10 19:06:34 +01:00
Michael Vogel b4631cebed Fixed SQL problems 2016-01-10 17:10:56 +01:00
Michael Vogel 23731fc9aa Bugfix: The display hadn't fetched the correct contact for the uid. 2016-01-10 15:44:23 +01:00
Michael Vogel 2f49e984bd Updated database.sql file, further code cleanup 2016-01-10 14:12:05 +01:00
Michael Vogel 214f381e81 Code cleanup 2016-01-10 12:37:49 +01:00
Michael Vogel 885dc1df81 gcontact update script, rebuilt follow page, query speedup for community and network groups 2016-01-10 09:19:00 +01:00
Michael Vogel 6703ba468a Profile data in gcontact overwrites profile data 2016-01-08 08:02:42 +01:00
Michael Vogel 358a9fd6fd Notify and alias will be fetched via OStatus 2016-01-08 00:35:46 +01:00
Michael Vogel 9521cdc18f notify and alias are now in gcontact as well - the contact expansion in mod/item.php is renewed 2016-01-07 23:43:16 +01:00
Michael Vogel fdb31abdfa Use gcontact when adressing contacts in editor 2016-01-07 08:19:28 +01:00
Michael Vogel 5ab2786c00 Get rid of the table "unique_contacts" 2016-01-06 22:23:12 +01:00
Michael Vogel 2bad2cdd91 More fields in gcontact, contact search respects "hide" setting 2016-01-06 14:13:59 +01:00
Michael Vogel 75e2ec01fe The gcontact will now be connected to the items 2016-01-05 15:34:27 +01:00
Michael Vogel c8449e6019 Code cleanup 2016-01-04 20:41:24 +01:00
fabrixxm d7410f9e47 Merge pull request #2238 from fabrixxm/develop 
Revert "Merge pull request #2223 from rabuzarus/2912_photo_widget"
 2016-01-04 11:48:41 +01:00
fabrixxm fcf7a791f1 Revert "Merge pull request #2223 from rabuzarus/2912_photo_widget" 
This reverts commit 83e54f70d3, reversing
changes made to ecf576bdd0.
 2016-01-04 11:46:19 +01:00
fabrixxm 83e54f70d3 Merge pull request #2223 from rabuzarus/2912_photo_widget 
photo aside widget for profile page
 2016-01-04 10:06:07 +01:00
fabrixxm ecf576bdd0 Merge pull request #2237 from tobiasd/20160103b 
moved include Scape to top of the file
 2016-01-03 19:50:16 +01:00
Tobias Diekershoff 75ed2f830d moved include Scape to top of the file 2016-01-03 19:15:13 +01:00
rabuzarus 29c671bb22 photos aside widget:permissions cleanup 2016-01-03 16:09:05 +01:00
rabuzarus 1ab022f4df photos aside widget: move dependencies to the header 2016-01-03 15:45:02 +01:00
Michael Vogel 771d0c4bfa Merge pull request #2224 from rabuzarus/2812_js_scrollbars 
Since we can easily remove it, we can accept this - and change it back if we need to. I haven't check accessibility - but this can be done later.
 2016-01-03 14:09:17 +01:00
fabrixxm 56e7f722a8 Merge pull request #2236 from tobiasd/20160103a 
Typo in DE translations
 2016-01-03 13:55:14 +01:00
Tobias Diekershoff 680f1073cb Typo in DE translations 2016-01-03 12:57:42 +01:00
Tobias Diekershoff 2b5366ce15 Merge pull request #2235 from annando/1601-bugfix-sql-api 
Bugfix: The table name was wrong
 2016-01-03 08:37:39 +01:00