clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 30049d862c Fix comment double-posting Hypolite Petovan 2017-03-15 07:07:06 -04:00
  • dc3fcf0487 Standard stuff Michael 2017-03-15 06:00:22 +00:00
  • 7cb44ae25a Turn all the action <a> tags into buttons - Add CSS changes to support both <a> and <button class="btn btn-link"> - Removed unnecessary "return false" in onclick attributes - Simplified tabs in profile page to native Bootstrap behavior Hypolite Petovan 2017-03-14 23:47:02 -04:00
  • fcea2e8504 Merge branch 'develop' into improvement/frio-action-links-to-buttons Hypolite Petovan 2017-03-14 23:12:21 -04:00
  • 2ff494d899 Merge branch 'develop' of https://github.com/friendica/friendica into develop Hypolite Petovan 2017-03-14 23:11:53 -04:00
  • 35ec1c8f26 Bugfix for pull request 3216 - feed items were mixed Michael 2017-03-14 21:14:09 +00:00
  • 187a81f159 Merge remote-tracking branch 'upstream/develop' into develop Michael 2017-03-14 21:13:02 +00:00
  • e57bd5fe55 Merge pull request #3233 from rabuzarus/20170314_-_pagination Michael Vogel 2017-03-14 20:05:29 +01:00
  • 0143369e54 limit pagination page buttons to max 10 rabuzarus 2017-03-14 18:31:03 +01:00
  • a7e8e86800 Merge pull request #3221 from strk/remember-openid Michael Vogel 2017-03-14 16:30:15 +01:00
  • 0d32f0be46 One forgotten standard Michael 2017-03-14 15:18:56 +00:00
  • f73389dd12 Standard stuff Michael 2017-03-14 15:17:21 +00:00
  • 79f14749df Merge branch 'develop' into improvement/frio-action-links-to-buttons Hypolite Petovan 2017-03-14 10:45:17 -04:00
  • 6d087aae23 Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop Hypolite Petovan 2017-03-14 10:30:04 -04:00
  • 3061a37b4f Merge pull request #3232 from Hypolite/issue/#3194-2 rabuzarus 2017-03-14 13:04:47 +01:00
  • f7855ecfe5 Merge remote-tracking branch 'friendica/develop' into develop Hypolite Petovan 2017-03-14 07:58:37 -04:00
  • fa3490ba5b Merge pull request #3224 from annando/1702-no-old_pager fabrixxm 2017-03-14 10:29:03 +01:00
  • 43ceb72196 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server Michael 2017-03-14 07:26:15 +00:00
  • 199bba20d9 Merge pull request #3200 from Hypolite/issue/#3195 Michael Vogel 2017-03-14 06:05:42 +01:00
  • 748caa0807 Removed debug output Michael 2017-03-14 04:58:05 +00:00
  • a2b7b2a968 Daily updating the server status Michael 2017-03-13 22:16:09 +00:00
  • 0b46a5f935 Standards: add braces Sandro Santilli 2017-03-13 23:09:09 +01:00
  • 8517ba1fab Remove extra space after open parentheses Sandro Santilli 2017-03-13 23:08:03 +01:00
  • 98945eb6fa Merge pull request #3213 from Hypolite/issue/#2792-2 Michael Vogel 2017-03-13 18:35:32 +01:00
  • eaf93dc041 I guess, @Hypolite will still find something to change ... Michael 2017-03-13 17:23:02 +00:00
  • 0dbc72c4ea Embrace the braces and spaces ... Michael 2017-03-13 16:18:45 +00:00
  • 327b00117d Improve dropItem() functionality Hypolite Petovan 2017-03-13 12:12:13 -04:00
  • f2a0c9fad1 Fix scrollToItem breaking dropItem functionality Hypolite Petovan 2017-03-13 12:10:03 -04:00
  • 054f43a332 Merge remote-tracking branch 'friendica/develop' into develop Hypolite Petovan 2017-03-13 11:53:34 -04:00
  • d2bad13e83 Added documentation Michael 2017-03-13 14:57:11 +00:00
  • ae64f6f7e2 z_fetch_url now always returns an array Michael 2017-03-13 14:37:51 +00:00
  • 0cb3dc92d3 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server Michael 2017-03-13 14:10:28 +00:00
  • e1eb9231f4 Merge pull request #3202 from Hypolite/issue/#3107 rabuzarus 2017-03-13 14:17:37 +01:00
  • cbaf196f50 Only remove the "remember me" cookie at submitting the auth form Sandro Santilli 2017-03-13 11:57:10 +01:00
  • f852f7aac0 Merge branch 'master' of github.com:annando/friendica Michael 2017-03-13 10:21:35 +00:00
  • 4d30f2b292 Merge remote-tracking branch 'upstream/master' Michael 2017-03-13 10:21:08 +00:00
  • bb59f105e7 Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server Michael 2017-03-13 10:18:56 +00:00
  • fbb84ee219 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server Michael 2017-03-13 10:18:29 +00:00
  • 52a35f9884 Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server Michael 2017-03-13 08:54:27 +00:00
  • 611cbcfd06 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server Michael 2017-03-13 08:53:57 +00:00
  • 83e5c31d28 Merge remote-tracking branch 'upstream/develop' into 1701-poco Michael 2017-03-13 08:49:33 +00:00
  • dfc5dc2e9e Merge pull request #3223 from annando/1702-no-language Tobias Diekershoff 2017-03-13 08:26:43 +01:00
  • 6a16565642 Merge remote-tracking branch 'upstream/develop' into 1701-poco Michael 2017-03-13 07:23:32 +00:00
  • e2c515baa9 Merge pull request #3225 from annando/1702-no_old_share Tobias Diekershoff 2017-03-13 07:52:38 +01:00
  • 44888590e5 One error, one documentation, one brace Michael 2017-03-13 06:32:33 +00:00
  • acadb8ecdb Remove redundancies. Michael 2017-03-13 06:09:00 +00:00
  • eb6a6228f7 more spaces Michael 2017-03-13 05:57:37 +00:00
  • 80e58964ce Standard stuff Michael 2017-03-13 00:09:32 +00:00
  • 97d3176754 Querying via nodeinfo Michael 2017-03-13 00:03:27 +00:00
  • d9da10975a Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server Michael 2017-03-12 22:24:06 +00:00
  • 49b22de705 Changes from previous pull request applied again Michael 2017-03-12 21:57:09 +00:00
  • e10339a47f Merge remote-tracking branch 'upstream/develop' into 1703-pdo Michael 2017-03-12 21:05:10 +00:00
  • 77e8c44016 Merge remote-tracking branch 'upstream/develop' into 1702-only-worker Michael 2017-03-12 21:03:44 +00:00
  • 1624150db4 Merge remote-tracking branch 'upstream/develop' into 1702-null-date Michael 2017-03-12 20:54:28 +00:00
  • 259598e569 Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share Michael 2017-03-12 20:52:48 +00:00
  • 044e9a6603 Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager Michael 2017-03-12 20:52:14 +00:00
  • b6a4a2ec7f Merge remote-tracking branch 'upstream/develop' into 1702-no-language Michael 2017-03-12 20:50:20 +00:00
  • 18d23ca443 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server Michael 2017-03-12 20:49:48 +00:00
  • 5718e49e68 Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop Hypolite Petovan 2017-03-12 11:19:37 -04:00
  • 7d1e54664a Merge pull request #3133 from mexon/mat/cidfix Tobias Diekershoff 2017-03-12 15:44:22 +01:00
  • 7275319eb6 Merge pull request #3214 from Hypolite/get_contact-rewrite Tobias Diekershoff 2017-03-12 15:42:17 +01:00
  • 1bf089e424 Merge pull request #3216 from annando/1701-performance Tobias Diekershoff 2017-03-12 15:40:56 +01:00
  • e29d7f19d1 Merge pull request #3222 from Hypolite/issue/#3220 Tobias Diekershoff 2017-03-12 15:35:42 +01:00
  • 30d82f4391 mark the develop version in the version string Tobias Diekershoff 2017-03-12 14:40:08 +01:00
  • 4cddb74f27 Merge branch 'master' into develop Tobias Diekershoff 2017-03-12 14:39:09 +01:00
  • 2bfa870c47 Friendica Version 3.5.1 Tobias Diekershoff 2017-03-12 14:38:01 +01:00
  • bfad58a777 We don't need to show the id. Michael 2017-03-12 09:41:10 +00:00
  • 3a3fa017a6 Discovery of new servers Michael 2017-03-12 09:13:04 +00:00
  • 2310bf994a Normalize line endings instead of adding <br> before Markdown() Hypolite Petovan 2017-03-12 03:55:22 -04:00
  • df6304cc42 Fix "remember me" cookie for OpenID logins Sandro Santilli 2017-03-12 01:11:35 +01:00
  • 3249152ac3 Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server Michael 2017-03-11 19:29:55 +00:00
  • 3fa4605ace Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop Hypolite Petovan 2017-03-09 21:11:14 -05:00
  • 3f6fd8ee69 Merge pull request #3208 from Hypolite/issue/#3194 fabrixxm 2017-03-09 09:37:21 +01:00
  • 2d2a35af73 Make Hypolite happy Michael 2017-03-08 18:03:41 +00:00
  • 32f1b2de20 Forgotten debug output Michael 2017-03-08 13:15:24 +00:00
  • d898616f8d Remove junk from the version number Michael 2017-03-08 05:40:57 +00:00
  • 37b15995d8 Add pump.io network to probing supported networks Hypolite Petovan 2017-03-07 16:43:22 -05:00
  • d7f62e82b9 Fix behavior regression Hypolite Petovan 2017-03-07 16:28:15 -05:00
  • f7f23038db Merge remote-tracking branch 'upstream/develop' into 1701-performance Michael 2017-03-07 21:24:20 +00:00
  • f09a8609df Better separation between queries with or without result Michael 2017-03-07 17:16:17 +00:00
  • 97378893cd Switch nurl and addr lookups Hypolite Petovan 2017-03-06 16:26:04 -05:00
  • 89f0b85905 Split slow catch-all query into three fast queries Hypolite Petovan 2017-03-06 16:19:12 -05:00
  • 116b9e1c1f Use Probe::uri instead of probe_url() Hypolite Petovan 2017-03-06 06:01:08 -05:00
  • ff64beeb4e Reformatted get_contact() Hypolite Petovan 2017-03-06 05:37:01 -05:00
  • 4931ecafbb Rewriting of do_like() Hypolite Petovan 2017-03-06 05:28:01 -05:00
  • d686bdcf09 Quickfix for SQL commands that should return "true" instead of an empty array Michael 2017-03-06 10:10:22 +00:00
  • 67ae0fed7f Fix response "self" assigment Hypolite Petovan 2017-03-06 05:07:17 -05:00
  • da5bbe8b50 Add public_contact() function Hypolite Petovan 2017-03-06 05:06:05 -05:00
  • 2ea50d9c47 Emulation for the mysqli behaviour when executing insert, update, ... Michael 2017-03-05 23:59:53 +00:00
  • 07516c318c We now support PDO for database connections as well Michael 2017-03-05 21:56:50 +00:00
  • 0989f725a6 Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server Michael 2017-03-05 16:23:58 +00:00
  • 9cbab5cd7a Merge pull request #3212 from annando/followup2-profile Tobias Diekershoff 2017-03-05 13:29:48 +01:00
  • 7867f6fcef Merge pull request #3211 from tobiasd/3.5.1rc Michael Vogel 2017-03-05 13:09:28 +01:00
  • 67dda52f4b issue solved Tobias Diekershoff 2017-03-05 12:41:02 +01:00
  • 5097c74d21 DE translations Tobias Diekershoff 2017-03-05 12:40:31 +01:00
  • 2775adfdf5 Second followup for profile issue Michael 2017-03-05 11:07:10 +00:00
  • 9a71472be6 Only store a new gserver entry if it is a valid one Michael 2017-03-04 14:32:40 +00:00
  • 953477de87 Improved check for the server base url Michael 2017-03-04 13:30:34 +00:00
  • b42167f0ac We can now return a list of known servers Michael 2017-03-04 11:04:00 +00:00
  • ec9dddb445 Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server Michael 2017-03-04 10:33:43 +00:00