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

Commit Graph

  • d8a8fa9baa Modified the warning message rebeka-catalina 2017-04-08 16:48:11 +02:00
  • 7320327fa1 Deleted the lone comma between paratheses rebeka-catalina 2017-04-08 16:37:18 +02:00
  • 895a6254a0 Correction of 1177 and added modification to 1171 rebeka-catalina 2017-04-08 15:48:15 +02:00
  • 42cc8d729b Merge pull request #3306 from Hypolite/issue/#3274 Tobias Diekershoff 2017-04-08 15:24:16 +02:00
  • 318166a381 Fix path to default Text_Highlighter CSS Hypolite Petovan 2017-04-08 08:59:41 -04:00
  • fa76ec4e33 Merge branch 'develop' of git://github.com/friendica/friendica into develop rebeka-catalina 2017-04-08 14:50:45 +02:00
  • bcfbfeeba4 adding space for readability rebeka-catalina 2017-04-08 13:52:37 +02:00
  • 5592837f71 Merge pull request #3305 from rabuzarus/20170408_-_fix_frio_css_nav_account_button Hypolite Petovan 2017-04-08 07:49:12 -04:00
  • c65fc6f8de Bugfix: there was a gui issue on the navbar account dropdown button rabuzarus 2017-04-08 13:30:16 +02:00
  • 4c9c83e8e8 Warning, that profile published in local directory may be visible in public rebeka-catalina 2017-04-08 13:21:35 +02:00
  • c58d7715ef Merge pull request #3303 from annando/1704-duplicate-feed rabuzarus 2017-04-08 13:20:46 +02:00
  • 892ef45474 Warning, that profile published in local directory may be visible in public rebeka-catalina 2017-04-08 13:13:38 +02:00
  • c94525938d Merge remote-tracking branch 'upstream/develop' into 1704-duplicate-feed Michael 2017-04-08 10:05:01 +00:00
  • 291906de5f Merge branch 'develop' of http://github.com/rebeka-catalina/friendica into develop rebeka-catalina 2017-04-08 11:42:20 +02:00
  • 8786bcdf0a Avoid duplicates with feeds and "remote self" Michael 2017-04-08 08:12:14 +00:00
  • 366ccdb09a Merge pull request #3301 from annando/issue-3300 rabuzarus 2017-04-07 23:48:32 +02:00
  • 47a6f6b726 Issue 3300: The temp path creation couldn't create a subdirectory with the hostname Michael 2017-04-07 21:34:06 +00:00
  • 56c0675fba Merge pull request #3295 from Hypolite/issue/#3274 Michael Vogel 2017-04-07 22:59:44 +02:00
  • 07f93b9636 Merge pull request #3298 from tobiasd/20170407-quattroadin fabrixxm 2017-04-07 14:31:28 +02:00
  • fb94a0add7 the Quattro admin_user template was missing the users note for the admin Tobias Diekershoff 2017-04-07 12:59:22 +02:00
  • b5a42c5b31 Merge pull request #3297 from rabuzarus/20170407_-_fix_bulk_deletion_button Tobias Diekershoff 2017-04-07 11:45:00 +02:00
  • 39ccbe2e45 Merge pull request #3296 from tobiasd/20170407-isresult rabuzarus 2017-04-07 11:41:38 +02:00
  • a9b3696560 Bugfix: bulk deletion button was not available anymore rabuzarus 2017-04-07 11:35:45 +02:00
  • 6060f311e9 small fix for #3254 Tobias Diekershoff 2017-04-07 11:26:11 +02:00
  • cfb99aa323 Merge pull request #3266 from rabuzarus/20170321_-_frio-fbbrowser Hypolite Petovan 2017-04-07 00:01:46 -04:00
  • b0accf4d4c Fix code blocks to Diaspora Hypolite Petovan 2017-04-06 23:49:56 -04:00
  • 8149e21add Enforce standards Hypolite Petovan 2017-04-06 23:43:55 -04:00
  • c9dafe3b4e Move HTML to Markdown library to Composer Hypolite Petovan 2017-04-06 23:33:12 -04:00
  • 4d27ac04bd Merge pull request #3294 from strk/openid-input-type-text Hypolite Petovan 2017-04-06 21:58:01 -04:00
  • 27cce1e6dc Add type="text" attribute for openid input field Sandro Santilli 2017-04-06 21:48:20 +02:00
  • 20f8b63fca unspaced ... ;-) Roland Haeder 2017-04-05 22:45:16 +02:00
  • 32ffe4a711 more spaces/curly braces added Roland Haeder 2017-04-05 22:39:57 +02:00
  • a4773a1ac0 added more spaces + fixed tpzo: occurence Roland Haeder 2017-04-05 22:33:28 +02:00
  • 28c08467fd Continued a bit: - added spaces/curly braces - used x($foo, 'bar') instead of isset($foo['bar']) - let's wrap html_entity_encode() somehow Roland Haeder 2017-04-05 22:30:12 +02:00
  • ddd875bba0 added more spaces (CR) Roland Haeder 2017-04-05 22:23:50 +02:00
  • 5a28eae59d Opps, fixed parser error ... Roland Haeder 2017-04-05 22:20:09 +02:00
  • 737a6670af Continued a bit: - more spaces added - more curly braces added - let's use x($_FOO, 'bar') and not isset($_FOOT['bar']) Roland Haeder 2017-04-05 22:17:15 +02:00
  • 2a2e55e53d overworked api.php: - added 'new' keyword because 'throw Exception' won't work - removed self-advertisement - added tons of spaces - added tons of curly braces - removed parentheses from require/include - more usage of dbm::is_result() - still there is a lot todo Roland Haeder 2017-04-05 22:07:55 +02:00
  • 98a7bdf791 Merge pull request #3290 from Hypolite/issue/#3274 Michael Vogel 2017-04-05 21:39:10 +02:00
  • 33e938a837 added spaces + used x() the proper way Roland Haeder 2017-04-05 19:35:49 +02:00
  • 57b6e4c636 added spaces (CR) Roland Haeder 2017-04-05 19:33:06 +02:00
  • 849e56e3a5 added spaces Roland Haeder 2017-04-05 19:27:34 +02:00
  • 64cf909ca2 added spaces Roland Haeder 2017-04-05 19:24:22 +02:00
  • c3b975e516 change fbrowser image margin and box-shadow rabuzarus 2017-04-05 12:46:09 +02:00
  • 190b03e706 add aria attributes for filebrowser rabuzarus 2017-04-05 12:34:00 +02:00
  • 0542cd6a14 add aria attributes + restructure some js to change the aria attributes rabuzarus 2017-04-05 11:46:42 +02:00
  • 1ab28bbe03 Add Text_Highlighter to Composer Hypolite Petovan 2017-04-05 00:31:49 -04:00
  • 3c6d976d31 Merge pull request #3289 from Hypolite/improvement/add-composer Michael Vogel 2017-04-05 05:21:15 +02:00
  • 6494d05dde Merge branch 'develop' of https://github.com/Hypolite/friendica into develop Hypolite Petovan 2017-04-04 21:48:36 -04:00
  • b09553a71b Add Composer FAQ Hypolite Petovan 2017-04-04 20:34:06 -04:00
  • 03571f6e74 added spaces + some curly braces + some usage of dbm::is_result() Roland Haeder 2017-04-04 19:46:56 +02:00
  • bebff8ebbb Merge pull request #3286 from annando/issue-1720 Tobias Diekershoff 2017-04-04 07:50:33 +02:00
  • 407e25e7d6 Some little standard stuff Michael 2017-04-04 05:39:43 +00:00
  • a0216af4bb Issue 1720: Group filter and new tab don't like each other Michael 2017-04-04 05:35:04 +00:00
  • 500f0985f8 Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop Hypolite Petovan 2017-04-03 22:06:09 -04:00
  • dd919b7f80 small css fix rabuzarus 2017-04-03 15:04:54 +02:00
  • 0bb1466723 use buttons for mobile jot nav rabuzarus 2017-04-03 14:32:54 +02:00
  • 0b280219c6 use box-shadow instead of border rabuzarus 2017-04-03 14:20:34 +02:00
  • 9f37acc6d4 add href attribute to jot links rabuzarus 2017-04-03 14:00:27 +02:00
  • 036c18be7b use height: 0 instead of display: none to hide jot sections rabuzarus 2017-04-03 13:38:07 +02:00
  • 68659c7740 add missing overflow to css rabuzarus 2017-04-03 12:55:06 +02:00
  • 4dfdbeba54 fix max-height for screens bigger than 768px rabuzarus 2017-04-03 12:46:31 +02:00
  • 48dde02e75 Merge pull request #3254 from Quix0r/rewrites/coding-convention-split2 Hypolite Petovan 2017-04-03 06:38:10 -04:00
  • 9237b2611a Merge branch 'develop' into rewrites/coding-convention-split2 Hypolite Petovan 2017-04-03 06:35:27 -04:00
  • e4917503da Merge pull request #3284 from annando/issue-3278 Hypolite Petovan 2017-04-02 22:49:07 -04:00
  • 80f5a026be re-enabel browser for small screens rabuzarus 2017-04-03 02:04:13 +02:00
  • ee293f2ce2 Merge develop into 20170321_-_frio-fbbrowser rabuzarus 2017-04-03 00:51:34 +02:00
  • 1ce5cc1b49 Merge pull request #3204 from Hypolite/improvement/frio-action-links-to-buttons rabuzarus 2017-04-02 23:15:57 +02:00
  • c574c317ef Removed unneeded comment Michael 2017-04-02 20:43:54 +00:00
  • 884c75a350 Issue 3278: Attachments in Reshares should now work Michael 2017-04-02 19:18:11 +00:00
  • 3e51ebd499 Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop Hypolite Petovan 2017-04-02 10:01:30 -04:00
  • d9451ef969 Merge pull request #3279 from Hypolite/improvement/add-composer Michael Vogel 2017-04-02 14:57:37 +02:00
  • 6a5b9dcd76 Merge pull request #3283 from annando/issue-2957-2 Hypolite Petovan 2017-04-02 08:56:35 -04:00
  • 95a5740229 Add links to EN pages in DE help Hypolite Petovan 2017-04-02 08:54:11 -04:00
  • 94f3f0887b Issue 2957: The avatar problem with mastodon should now finally be solved Michael 2017-04-02 12:37:22 +00:00
  • ed3aa9fa73 Merge pull request #3282 from annando/1704-platform-name Tobias Diekershoff 2017-04-02 10:03:57 +02:00
  • 54f49169d4 Show real platform names Michael 2017-04-02 07:53:55 +00:00
  • 2952e2b3e4 Merge pull request #3281 from annando/issue-3206-2957 Hypolite Petovan 2017-04-01 21:24:28 -04:00
  • 00577eab2c Add EOF newline to composer.json Hypolite Petovan 2017-04-01 21:09:36 -04:00
  • 07fd61b912 Mastodon: plink for reshares, missing hostnames for avatars Michael 2017-04-01 23:39:19 +00:00
  • 7606ac5e32 frio: Fix help pages inline code display Hypolite Petovan 2017-04-01 17:58:35 -04:00
  • 1c276b5cd5 Add Composer documentation Hypolite Petovan 2017-04-01 17:58:21 -04:00
  • 49527b70d3 Merge branch 'develop' into rewrites/coding-convention-split2 Roland Häder 2017-04-01 22:16:08 +02:00
  • 3cea176ef2 added spaces + used x () Roland Haeder 2017-04-01 21:46:57 +02:00
  • 7cd795d795 Merge pull request #3280 from annando/issue-3142-2 Hypolite Petovan 2017-04-01 14:32:27 -04:00
  • 240a0961c6 Standards ... Michael 2017-04-01 17:08:11 +00:00
  • 648d5bd047 More mcrypt is removed Michael 2017-04-01 10:07:12 +00:00
  • 16d4392573 Documentation added Michael 2017-04-01 09:05:56 +00:00
  • f6d7ee2781 Issue 3142: mcrypt is no more (as well as phpseclib) Michael 2017-04-01 08:28:42 +00:00
  • 806368f151 Move MobileDetect library to vendor Hypolite Petovan 2017-03-31 23:05:07 -04:00
  • 799e60aa62 Replace existing autoloader with Composer-supplied Hypolite Petovan 2017-03-31 23:02:38 -04:00
  • cae0543629 Composer: Add vendor directry Hypolite Petovan 2017-03-31 22:34:30 -04:00
  • 8c49a7b68f Add composer.json Hypolite Petovan 2017-03-31 22:33:18 -04:00
  • c97b1d6c03 Add executable composer.phar in util Hypolite Petovan 2017-04-01 01:24:10 +02:00
  • 87aac45230 Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop Hypolite Petovan 2017-03-31 19:14:27 -04:00
  • 60552260e1 Continued with CR: - added spaces as requested - removed parentheses from include/require calls as they are no functions Roland Haeder 2017-03-31 21:04:08 +02:00
  • d4e67338d8 space-time contines ... Roland Haeder 2017-03-31 20:55:50 +02:00
  • 18ca141f5c space-time! Roland Haeder 2017-03-31 20:52:32 +02:00
  • 44a137a8de Continued a bit: - converted multiple single-line comments into one multi-line comment - added spaces (space-time!) Roland Haeder 2017-03-31 20:51:18 +02:00
  • 07a0d300c3 added space, marked rest 86 occurrences in todos.txt Roland Haeder 2017-03-31 20:49:43 +02:00