MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Commit graph

  • 401934f21f
         Merge pull request #4883 from nupplaphil/install_config Hypolite Petovan 2018-04-21 09:59:57 -04:00
  • d08ddaa116
         Merge pull request #4884 from rabuzarus/20180421_-_fix_image_upload_for_msg Hypolite Petovan 2018-04-21 09:58:54 -04:00
  • a65e93faea frio - fix default template if friendica is installed into a subdirectory rabuzarus 2018-04-21 15:43:11 +02:00
  • 54c3efccab frio - don't show the "insert image" button in modals (because it doesn't work at the current state) rabuzarus 2018-04-21 14:27:57 +02:00
  • 334d392154 Merge remote-tracking branch 'origin/develop' into install_config Philipp Holzer 2018-04-21 14:23:49 +02:00
  • 346697d771 Moved .htconfig file Philipp Holzer 2018-04-21 14:10:53 +02:00
  • 4285cd5dc7 frio - fix image upload for prv messages rabuzarus 2018-04-21 14:05:40 +02:00
  • ebe203336f
         Merge pull request #4882 from annando/private-forums Tobias Diekershoff 2018-04-21 13:54:10 +02:00
  • fd7658a70a Contact requests from Diaspora for private forums aren't accepted automatically anymore Michael 2018-04-21 10:39:46 +00:00
  • e61ed380f7 Reworked dfrn_notify endpoint, added public endpoint Michael 2018-04-21 09:55:41 +00:00
  • 1e67c32142 Fix BBCode::getAbstract scope Hypolite Petovan 2018-04-21 04:38:27 -04:00
  • abc50eb3ae Improve Model\Item::addLanguageInPostopts() Hypolite Petovan 2018-04-21 04:11:32 -04:00
  • ec9baef968 Add new Content\BBCode::toPlaintext() Hypolite Petovan 2018-04-21 04:10:25 -04:00
  • 5476da53aa Move Content\BBCode::toPlaintext() to Model\Item::getPlaintextPost() Hypolite Petovan 2018-04-21 04:09:45 -04:00
  • c57f0bcce6
         Merge pull request #4880 from tobiasd/20180421-lng Hypolite Petovan 2018-04-21 02:40:30 -04:00
  • e65395a17f update PL translations THX waldis Tobias Diekershoff 2018-04-21 07:45:06 +02:00
  • b3e10f96a8 update PL translations THX waldis Tobias Diekershoff 2018-04-21 07:44:54 +02:00
  • 87d55e69e2 update FI translations THX Kris Tobias Diekershoff 2018-04-21 07:43:29 +02:00
  • ec8720224d update DE translations Tobias Diekershoff 2018-04-21 07:42:31 +02:00
  • 69a7afc577
         Merge pull request #4855 from M-arcus/env-var-mysql Hypolite Petovan 2018-04-20 12:30:17 -04:00
  • 26ba5edda7
         [TASK] Template: Add check for environment values Marcus Müller 2018-04-20 18:24:28 +02:00
  • 19cddd2bc8
         [TASK] Config: Add check for environment values Marcus Müller 2018-04-20 18:21:00 +02:00
  • ea1a434dc1
         Merge pull request #4877 from fabrixxm/dev/followup-pr4861 Tobias Diekershoff 2018-04-20 14:36:54 +02:00
  • f976361935 Frio admin/users template: show account type in user details fabrixxm 2018-04-20 14:30:04 +02:00
  • 12b7bce1cc admin users, don't set account-type if page flag isn't PAGE_NORMAL fabrixxm 2018-04-20 14:27:36 +02:00
  • 23e5225b20 Frio admn/users: use icons for page flags and account type in table fabrixxm 2018-04-20 14:11:34 +02:00
  • 516eb2b9ea Frio admin/users template: fix users avatars, table cols width to have more space fabrixxm 2018-04-20 14:07:11 +02:00
  • 9a7f508550 Admin users: Update page type names, add raw flags template context fabrixxm 2018-04-20 14:02:45 +02:00
  • 92473e15b5
         Merge pull request #4875 from tobiasd/20180420-msg Hypolite Petovan 2018-04-20 07:57:59 -04:00
  • 12e79a68b7
         Merge pull request #4874 from tobiasd/20180420-lng Hypolite Petovan 2018-04-20 07:57:13 -04:00
  • da541513ad regenerated master messages.po file Tobias Diekershoff 2018-04-20 09:31:27 +02:00
  • 4d4ed6fb17
         Merge pull request #4863 from MrPetovan/task/4860-add-hidden-input-in-console Tobias Diekershoff 2018-04-20 09:29:17 +02:00
  • 3a52ffc1b8 IT, FI and ZH_CN translation updates Tobias Diekershoff 2018-04-20 08:30:40 +02:00
  • e2ded28504
         Merge pull request #4870 from astifter/develop Hypolite Petovan 2018-04-19 15:35:48 -04:00
  • dc4b384414 Merge branch 'develop' of https://github.com/friendica/friendica into develop Friendica 2018-04-19 19:24:35 +00:00
  • 400bab676d Add space before Impressum. Friendica 2018-04-19 19:03:29 +00:00
  • 53b7e4b102
         Merge pull request #4861 from fabrixxm/issue/3395 Hypolite Petovan 2018-04-19 13:03:03 -04:00
  • abd7b2666c Frio: admin/users template fabrixxm 2018-04-19 19:00:16 +02:00
  • e909beee04 Frio: admin/users template fabrixxm 2018-04-19 18:17:46 +02:00
  • f043554ab7
         Merge pull request #4849 from M-arcus/installation-script Hypolite Petovan 2018-04-19 07:57:02 -04:00
  • f65a7b3130 Add hidden password input to Console\NewPassword Hypolite Petovan 2018-04-18 22:56:52 -04:00
  • 0496822ca3 Add Exception when password is empty in User::hashPassword() Hypolite Petovan 2018-04-18 22:49:14 -04:00
  • b73d5a641f [Composer] Add seld/cli-prompt dependency Hypolite Petovan 2018-04-18 22:47:27 -04:00
  • e2a58a791c
         [DOCS] Auto Install: Add description Marcus Müller 2018-04-19 10:21:41 +02:00
  • ab82c6df03
         Merge pull request #4865 from annando/dfrn-reshare Tobias Diekershoff 2018-04-19 08:43:18 +02:00
  • 10465110c1
         Merge pull request #4851 from MrPetovan/task/4709-add-query-based-content-filter Michael Vogel 2018-04-19 08:21:53 +02:00
  • 32f78a4b01
         Merge pull request #4864 from MrPetovan/bug/fix-memcached-delete Michael Vogel 2018-04-19 08:16:18 +02:00
  • c507cdf946 Code simplified Michael 2018-04-19 06:07:23 +00:00
  • da06416426 Merge remote-tracking branch 'upstream/develop' into dfrn-reshare Michael 2018-04-19 05:44:06 +00:00
  • 87f638bdc9 Improve CacheSessionhandler Hypolite Petovan 2018-04-18 23:37:06 -04:00
  • ca4ca51c6a Add hostname prefix in MemcachedCacheDriver Hypolite Petovan 2018-04-18 23:36:23 -04:00
  • 20a2918bda Frio: admin/user template fixes fabrixxm 2018-04-18 21:43:33 +02:00
  • 362654abf0 Fix indentation fabrixxm 2018-04-18 19:44:10 +02:00
  • 1017e244ca Frio: add template for admin/users fabrixxm 2018-04-18 17:52:34 +02:00
  • 457b86711d
         [TASK] Auto install: Rework class Marcus Müller 2018-04-18 14:30:42 +02:00
  • 24626f5fd2
         [TASK] Auto install: Rename script command Marcus Müller 2018-04-18 14:21:40 +02:00
  • 7b7ca71bf6
         [TASK] Auto install: Rename script command Marcus Müller 2018-04-18 14:20:21 +02:00
  • d53e64a583
         [TASK] Install Script: Register installation class Marcus Müller 2018-04-18 11:46:27 +02:00
  • 1d552b5e66
         [TASK] Install script: Add installation class Marcus Müller 2018-04-18 11:43:23 +02:00
  • 96d8591b95
         [TASK] Remove auto_install.php Marcus Müller 2018-04-18 11:40:16 +02:00
  • 21dbe233cb
         Merge pull request #4859 from tobiasd/20180418-lng Michael Vogel 2018-04-18 08:17:16 +02:00
  • 9cb2369c15 update to the FI translation THX Kris Tobias Diekershoff 2018-04-18 07:57:16 +02:00
  • fda5ad647d
         Merge pull request #4857 from annando/duplicated-tags Tobias Diekershoff 2018-04-18 07:50:56 +02:00
  • 596b934a02
         Merge pull request #4858 from annando/issue-4655 Tobias Diekershoff 2018-04-18 07:50:34 +02:00
  • 8a730b2d85 Issue 4655: Avoid multiplicated contact requests from the same account Michael 2018-04-18 05:02:59 +00:00
  • ed87e634ed Avoid duplicated multibyte tags Michael 2018-04-18 05:00:28 +00:00
  • f99af007ae Replaced queries Michael 2018-04-18 04:59:33 +00:00
  • 88353ce56f Merge remote-tracking branch 'upstream/develop' into dfrn-reshare Michael 2018-04-18 03:12:13 +00:00
  • 188158274c [Composer] Add bower-asset/vue dependency Hypolite Petovan 2018-04-17 19:56:47 -04:00
  • 961a6d29a9
         Merge pull request #4856 from annando/dandelion Hypolite Petovan 2018-04-17 12:50:06 -04:00
  • 229d8eb0e9 better support for the Diaspora app "Dandelion" Michael 2018-04-17 16:46:57 +00:00
  • fc8b11283a
         [TASK] Template: Environment variables for MySQL Marcus Müller 2018-04-17 18:40:24 +02:00
  • 2cdcd13e68
         [TASK] Config: Add MySQL environment variables Marcus Müller 2018-04-17 18:37:59 +02:00
  • 6d2d15a80d
         Merge pull request #4782 from Alkarex/fix-update-password Hypolite Petovan 2018-04-17 07:25:52 -04:00
  • 7b6d1e1ab3
         Merge pull request #4853 from annando/site-defaults Tobias Diekershoff 2018-04-17 10:12:11 +02:00
  • 865c7f79b9
         Merge pull request #4852 from tobiasd/20180417-fi Michael Vogel 2018-04-17 07:24:48 +02:00
  • e5583591d7 Default values for site configuration Michael 2018-04-17 05:18:26 +00:00
  • 6f7de87088 update to the FI translation THX Kris Tobias Diekershoff 2018-04-17 07:17:46 +02:00
  • 98f64ed824 Replace duplicate behaviors by Model\Term::populateTagsFromItem Hypolite Petovan 2018-04-14 17:55:07 -04:00
  • 17a0cc4f3d Add Model\Term::populateTagsFromItem method Hypolite Petovan 2018-04-14 17:54:16 -04:00
  • 54b75026fc Add header support for security token check Hypolite Petovan 2018-04-11 23:28:51 -04:00
  • cc40dcf83c Add dbstructure_definition hook call Hypolite Petovan 2018-04-11 23:28:05 -04:00
  • 0334e49d8e
         Merge pull request #4850 from tobiasd/20180416-newinfo Hypolite Petovan 2018-04-16 14:35:57 -04:00
  • 150843af5f new info mail address Tobias Diekershoff 2018-04-16 17:28:19 +02:00
  • 791071a1c6
         [CLEANUP] Code: Remove function Marcus Müller 2018-04-16 14:56:02 +02:00
  • e590610eee
         Merge pull request #4848 from tobiasd/20180416-tos2 Hypolite Petovan 2018-04-16 07:35:59 -04:00
  • 03748ddd64
         [FEATURE] Install Script: Add first version Marcus Müller 2018-04-16 10:57:27 +02:00
  • f3c8631cbd display the thing Tobias Diekershoff 2018-04-16 10:25:39 +02:00
  • d5fd87232e
         Merge pull request #4847 from tobiasd/20180416-tos Michael Vogel 2018-04-16 10:12:17 +02:00
  • 72a2896d1f profile data is transmitted to other nodes Tobias Diekershoff 2018-04-16 09:27:16 +02:00
  • 072d446c95
         Merge pull request #4846 from tobiasd/20180416-lng Michael Vogel 2018-04-16 08:50:47 +02:00
  • 537394e45c update to the PL translation THX waldis Tobias Diekershoff 2018-04-16 07:09:08 +02:00
  • 12a71f0155
         Merge pull request #4845 from annando/diaspora-forums Hypolite Petovan 2018-04-15 16:35:30 -04:00
  • 6eba2ccd9b Forum posts now show the author when posted to Diaspora Michael 2018-04-15 19:01:19 +00:00
  • c7e6d229ec
         Merge pull request #4842 from tobiasd/20180415-deluser Hypolite Petovan 2018-04-15 06:41:44 -04:00
  • d149541dba notify admin when user deletes account Tobias Diekershoff 2018-04-15 11:39:05 +02:00
  • 360e2e6342 Revert removal of legacy_password column Alexandre Alapetite 2018-04-15 11:12:32 +02:00
  • 991a3d959e Revert "Remove SQL column legacy_password" Alexandre Alapetite 2018-04-15 10:51:22 +02:00
  • e7680a40d4
         Merge pull request #4840 from AndyHee/doc20180413 Hypolite Petovan 2018-04-14 07:50:08 -04:00
  • c039c30837
         Update Making-Friends.md Andy H3 2018-04-14 16:27:49 +07:00