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

Commit Graph

  • 88018b6e73 Merge remote-tracking branch 'upstream/develop' into 1602-remove-simplepie Michael Vogel 2016-02-14 20:57:57 +01:00
  • b0548018d8 Simplepie is removed since we don't use it anymore Michael Vogel 2016-02-14 19:50:59 +01:00
  • 7f1f549c6f Fallback when there is no nick name Michael Vogel 2016-02-14 15:08:49 +01:00
  • 21fc3c60d4 We now show the correct platform (redmatrix or hubzilla) Michael Vogel 2016-02-14 15:05:43 +01:00
  • ec57b61f01 The feed function has now a simulation mode Michael Vogel 2016-02-14 15:02:59 +01:00
  • 922186bdd1 Small bugfix for the keyword bug in the gcontact table Michael Vogel 2016-02-14 12:39:57 +01:00
  • 5d35974c19 "addr" and "server_url" are now generated directly in "update_gcontact" if not given. Michael Vogel 2016-02-14 11:56:23 +01:00
  • 3f5f1351b9 api: throw HTTPException instead of calling api_error directly fabrixxm 2016-02-14 11:24:51 +01:00
  • b9e1792076 The shadow contact (contact with uid=0) will be updated now as well. Michael Vogel 2016-02-14 07:31:57 +01:00
  • e5c7a0cf93 Enable SSL on standard and well-known HTTP headers Olivier Mehani 2016-02-09 10:04:48 +00:00
  • 5086b8b2a7 DFRN Bugfix: The poco data wasn't sent Michael Vogel 2016-02-14 00:14:03 +01:00
  • 15296b8036 Avoid errors when noscrape data can't be fetched. Michael Vogel 2016-02-13 22:20:00 +01:00
  • f496af08bb OStatus: The gcontact table will now be updated from the conversation as well Michael Vogel 2016-02-13 21:35:05 +01:00
  • 9261154eab Merge remote-tracking branch 'upstream/develop' into 1602-gcontact-cleanup Michael Vogel 2016-02-13 20:12:31 +01:00
  • d0b5c16a20 Merge pull request #2351 from annando/1602-performance-unread-group Tobias Diekershoff 2016-02-13 19:43:33 +01:00
  • 6268d776af Merge pull request #2350 from annando/1602-vier-aside-img Tobias Diekershoff 2016-02-13 19:42:35 +01:00
  • bf7dedb03b Optimized query for unread group postings Michael Vogel 2016-02-13 18:15:24 +01:00
  • 307f90cdfe Vier: Pictures in the side bar shouldn't be larger than the side bar Michael Vogel 2016-02-13 14:21:53 +01:00
  • a4da9fb55d Update the gcontact entry when the contact entry is checked for updates Michael Vogel 2016-02-13 14:09:08 +01:00
  • 253ba45c1a Added a to-do Michael Vogel 2016-02-13 13:30:53 +01:00
  • 4ee15cc682 Merge pull request #2334 from fabrixxm/feature_autoloader Tobias Diekershoff 2016-02-13 12:27:24 +01:00
  • 2ca6cdf6b6 Improvements how gcontact entries are updated Michael Vogel 2016-02-13 12:26:58 +01:00
  • a7498ef50d doc: add quick intro to autoloading fabrixxm 2016-02-13 10:57:37 +01:00
  • 036311237f Merge pull request #2348 from annando/1602-poller-again Tobias Diekershoff 2016-02-12 11:25:49 +01:00
  • acb09d3a3d Database connections: When we now check for user values we check the system values as well Michael Vogel 2016-02-12 11:04:25 +01:00
  • 89d63b2523 docs: small fixes to help sidebar Fabrixxm 2016-02-12 09:26:42 +01:00
  • 45c4e3455e docs: add brief autoloading help page, fix smarty3 help page name Fabrixxm 2016-02-12 09:25:33 +01:00
  • 8451397857 Merge pull request #2346 from annando/1602-poller-user-limits Tobias Diekershoff 2016-02-12 08:17:30 +01:00
  • 810843763d Merge pull request #2347 from annando/1602-dfrn-forum Tobias Diekershoff 2016-02-12 08:16:10 +01:00
  • b5c5471748 Added some documentation Michael Vogel 2016-02-12 07:39:08 +01:00
  • 4dad744c35 DFRN-Bugfix: Forums should work now Michael Vogel 2016-02-11 22:35:06 +01:00
  • 5027fbf733 Poller: Now the user limits can be detected automatically as well Michael Vogel 2016-02-11 21:39:34 +01:00
  • 82ffd0f596 Merge pull request #2344 from annando/1602-poller-processlist Tobias Diekershoff 2016-02-11 11:51:02 +01:00
  • 4af77b60ce Poller: Use the processlist when the number of maximum database connections was provided manually Michael Vogel 2016-02-11 11:33:45 +01:00
  • a4804a25ee Merge pull request #2343 from fabrixxm/api_ping Tobias Diekershoff 2016-02-11 09:34:47 +01:00
  • e20aad4347 fix missing html2plain() function declaration fabrixxm 2016-02-11 09:05:00 +01:00
  • c5f2157eb2 Merge pull request #2336 from stieben/move-div-pause Tobias Diekershoff 2016-02-11 07:36:37 +01:00
  • f48a639537 Merge pull request #2341 from annando/1602-contact-bugfix Tobias Diekershoff 2016-02-11 07:35:32 +01:00
  • ef0f826fd0 Merge pull request #2325 from fabrixxm/api_ping Michael Vogel 2016-02-10 23:47:11 +01:00
  • 20d7d18379 Bugfix: The "keywords" field in the gcontact table wasn't set correctly Michael Vogel 2016-02-10 23:39:18 +01:00
  • 255638ff65 Merge pull request #2338 from annando/1602-poller-max Tobias Diekershoff 2016-02-10 12:49:49 +01:00
  • 902820b30d Added documentation Michael Vogel 2016-02-10 07:56:49 +01:00
  • 211be5bfc5 Poller: The maximum number of connections can now be configured Michael Vogel 2016-02-09 23:28:33 +01:00
  • e104c58191 Added div#pause to themes' default.php Andrej Stieben 2016-02-09 16:41:19 +01:00
  • 4d7a6aaed2 Moved div#pause from index.php to view/default.php Andrej Stieben 2016-02-09 15:54:35 +01:00
  • 04dceb9551 Merge branch 'develop' into api_ping Fabrixxm 2016-02-09 14:06:57 +01:00
  • 743f2e0391 Merge develop into 0602_contact_profile rabuzarus 2016-02-09 13:44:30 +01:00
  • b5100b3154 Merge pull request #2332 from annando/1602-no-guid fabrixxm 2016-02-09 13:40:05 +01:00
  • d2a9aa1972 add some doxygen comments Fabrixxm 2016-02-09 11:10:00 +01:00
  • aec8a1883e let autoloader include files for HTMLPurifier Fabrixxm 2016-02-09 11:08:26 +01:00
  • c6514d58db add composer-derived autoloader Fabrixxm 2016-02-09 11:07:37 +01:00
  • c28109ca94 Update HTMLPurifier to v4.7.0 Fabrixxm 2016-02-09 11:06:17 +01:00
  • 2932ebfbc8 Merge pull request #2331 from fabrixxm/revert_pr2319 Michael Vogel 2016-02-09 10:52:46 +01:00
  • 7b2fadcf43 Get rid of the "guid" table. We don't need it anymore. Michael Vogel 2016-02-09 10:21:10 +01:00
  • 5250fed447 Revert "Merge pull request #2319 from stieben/develop" Fabrixxm 2016-02-09 09:39:29 +01:00
  • 3c97a6703c Merge pull request #2329 from annando/1602-poller-db Tobias Diekershoff 2016-02-09 07:36:39 +01:00
  • 804c04a06f Merge pull request #2326 from fabrixxm/revert_db949bb8 Michael Vogel 2016-02-09 06:55:49 +01:00
  • 7af3dd01d8 Poller: Check the number of used database connections Michael Vogel 2016-02-09 06:42:00 +01:00
  • 7001a231e4 Merge pull request #2327 from annando/1602-dfrn-poke Tobias Diekershoff 2016-02-09 06:27:09 +01:00
  • c1c21ada0a contactedit-actions-button: remove contact tabs which aren't needed anymore rabuzarus 2016-02-08 23:51:51 +01:00
  • 2e04a00d30 contactedit-actions-button: some adjustment for vier dark scheme rabuzarus 2016-02-08 23:25:48 +01:00
  • 0c764684bb Merge develop into 0602_contact_profile rabuzarus 2016-02-08 23:16:02 +01:00
  • 0b5d7b300e contactedit-actions-button: adjust the themes and template polishing rabuzarus 2016-02-08 23:15:20 +01:00
  • 981aad46d3 DFRN: Sending pokes does work now again Michael Vogel 2016-02-08 22:37:29 +01:00
  • 909bca90e8 Merge pull request #1 from friendica/develop Andrej Stieben 2016-02-08 22:23:01 +01:00
  • 0c67c89715 Merge pull request #2323 from annando/1601-dfrn-import fabrixxm 2016-02-08 15:48:16 +01:00
  • b3f7e8d388 Now the public static functions are public static functions Michael Vogel 2016-02-08 15:26:24 +01:00
  • cc18fd7ad9 contactedit-actions-button: doing some availability checks for the actions rabuzarus 2016-02-08 15:00:53 +01:00
  • 2a016e7685 add missing query backticks Fabrixxm 2016-02-08 14:35:41 +01:00
  • 9ff0fc92dd NotificationsManager: add backtick to queries Fabrixxm 2016-02-08 13:42:06 +01:00
  • a283691149 api docs: fix indentation Fabrixxm 2016-02-08 10:34:27 +01:00
  • 870d2f844d Update API docs Fabrixxm 2016-02-08 10:22:12 +01:00
  • 756b90a4e0 add docs, rewrite part of the notification api Fabrixxm 2016-02-08 09:47:59 +01:00
  • 4d21671f75 Merge pull request #2314 from rabuzarus/0302_datetime_cleanup Michael Vogel 2016-02-08 03:33:25 +01:00
  • e267630c54 datetime.php: cleanup - delete some dots which shouldn't be there rabuzarus 2016-02-08 01:59:05 +01:00
  • 991cbd604a contact-edit-actions-button: initial commit rabuzarus 2016-02-08 01:56:15 +01:00
  • b202e02fbf Revert "Updated modules to allow for partial overrides without errors" fabrixxm 2016-02-07 15:11:34 +01:00
  • 102c06a41f fix error in template in notifications page fabrixxm 2016-02-07 14:29:07 +01:00
  • 44592611e1 new api for notifications fabrixxm 2016-02-07 14:27:13 +01:00
  • d6cf791677 Merge pull request #2324 from rabuzarus/0502_vier_dark fabrixxm 2016-02-07 09:53:24 +01:00
  • 9330a6994c Merge pull request #2319 from stieben/develop fabrixxm 2016-02-07 09:52:20 +01:00
  • ecfb6ec924 Merge pull request #2313 from rabuzarus/0302_forum_class fabrixxm 2016-02-07 09:28:50 +01:00
  • af219ac9ec Just some more code cleanup and documentation. Michael Vogel 2016-02-06 21:44:10 +01:00
  • 8ea4659031 The code was rearranged to improve readability Michael Vogel 2016-02-06 17:48:03 +01:00
  • 95819684c2 Merge develop into 0502_vier_dark rabuzarus 2016-02-06 13:09:41 +01:00
  • 3890415767 Receiving pokes work now Michael Vogel 2016-02-06 11:16:00 +01:00
  • bd3e10b132 Bugfix in the poke function / added documentation. Michael Vogel 2016-02-06 10:16:16 +01:00
  • 99c3db98a7 Merge pull request #2322 from rabuzarus/0502_vier_smiley Tobias Diekershoff 2016-02-06 07:27:33 +01:00
  • 4896517385 datetime.php: little more docu rabuzarus 2016-02-06 01:08:10 +01:00
  • 0bccfea596 vier: some consistency fixes for the dark scheme rabuzarus 2016-02-06 00:54:50 +01:00
  • 9e3f849e89 Added documentation Michael Vogel 2016-02-05 22:12:54 +01:00
  • db949bb802 Updated modules to allow for partial overrides without errors Andrej Stieben 2016-02-05 21:52:39 +01:00
  • bcf1020635 vier smileybutton: dark.css insert new line at the end of the file rabuzarus 2016-02-05 21:38:55 +01:00
  • 1c82e9f209 Bugfix for OStatus to prevent sending messages from wrong senders Michael Vogel 2016-02-05 21:31:11 +01:00
  • 9fd3d8116b vier smileybutton: little polish in dark.css rabuzarus 2016-02-05 21:30:31 +01:00
  • d408cea871 DFRN import has now gone live Michael Vogel 2016-02-05 21:25:20 +01:00
  • 41405ed0f2 vier: display smiley-preview as inline-block - needs addons update rabuzarus 2016-02-05 21:24:01 +01:00
  • 0a5297970b Merge pull request #2321 from fabrixxm/mobile_acl_dialog Tobias Diekershoff 2016-02-05 19:06:24 +01:00
  • f70f4bb899 ACL: fix TypeError when selecting permissions fabrixxm 2016-02-05 18:43:46 +01:00
  • 30c375d238 rework autocomplete: polishing class and methods naming rabuzarus 2016-02-05 14:26:22 +01:00