Commit graph

  • a4f0902926 small refactor, added push unsub notice for BE Henry Jameson 2018-12-25 03:46:19 +03:00
  • 6fa993c122
    remove unneeded numbered variables who_to_follow Hannah Ward 2018-12-25 00:34:33 +00:00
  • 4752081818 Add closed-check for touchmove shpuld 2018-12-23 20:14:40 +02:00
  • e46b560ead move closing logic to drawer, add swipe to close shpuld 2018-12-23 19:50:19 +02:00
  • f72b1d048e Merge branch 'develop' into feature/replace-panel-switcher shpuld 2018-12-22 17:32:35 +02:00
  • 4836c8ac74 Add some more routes to side drawer shpuld 2018-12-22 17:32:07 +02:00
  • e59b67e119 Merge branch 'captcha' into 'develop' Shpuld Shpludson 2018-12-22 06:17:56 +00:00
  • 10642df528 Add a translation to the captcha strings in the registration form Ekaterina Vaartis 2018-12-21 09:53:04 +03:00
  • 661efc51b7 Small UI improvements for the CAPTCHA field Ekaterina Vaartis 2018-12-21 00:25:36 +03:00
  • 8470856045 Add encrypted captcha_answer_data for stateless captcha Ekaterina Vaartis 2018-12-21 00:25:09 +03:00
  • 67263cde05 works but hacky shpuld 2018-12-20 22:20:04 +02:00
  • 957b2a6f7e simplified some code, made it possible to unregister serviceworker altogether Henry Jameson 2018-12-20 09:17:59 +03:00
  • d0b47488fb default webPush to false, because having it at true leads to some problems with local dev mode. Instances can re-enable it, and BE can default it to true in config.exs Henry Jameson 2018-12-20 09:15:30 +03:00
  • 2921a25cb4 Merge branch 'fix_followers' into 'develop' Shpuld Shpludson 2018-12-20 06:12:14 +00:00
  • b7962a224c fixes many problems related to user profile Henry Jameson 2018-12-20 07:54:55 +03:00
  • 5970bf4e85 fixed incorrect height when empty text Henry Jameson 2018-12-20 07:27:29 +03:00
  • afa2baec0c I suppose SOME browsers don't do this by default... Henry Jameson 2018-12-19 01:23:52 +03:00
  • ae7b96abbf Fix resize not working properly for textareas Henry Jameson 2018-12-19 01:11:57 +03:00
  • b65ac128c1 Merge branch 'remove_favorite_hacks' into 'develop' HJ 2018-12-19 14:57:25 +00:00
  • c54b1fd0c5 Merge branch 'fix_defaults' into 'develop' Shpuld Shpludson 2018-12-19 04:51:21 +00:00
  • 5c2030e467 no more "broken favorite" Henry Jameson 2018-12-19 01:55:53 +03:00
  • c7514be46f Fixed some settings not using defaults from instance config. Made some parts of code more readable Henry Jameson 2018-12-18 23:31:10 +03:00
  • 640a287892 Merge branch 'develop' into feature/replace-panel-switcher shpuld 2018-12-18 22:09:27 +02:00
  • 562c68a51c Merge branch 'user-profile-overhault' into 'develop' HJ 2018-12-18 19:48:05 +00:00
  • 81c83566cd Merge remote-tracking branch 'upstream/develop' into user-profile-overhault Henry Jameson 2018-12-18 22:43:26 +03:00
  • f62ff2d894 Merge branch 'feature/bigger-icons-for-mobile' into 'develop' Shpuld Shpludson 2018-12-18 18:26:14 +00:00
  • 67c2a607aa Feature/bigger icons for mobile / #211 Shpuld Shpludson 2018-12-18 18:26:14 +00:00
  • 2f28bf95fd Merge branch 'feature/new-user-routes' into 'develop' lambda 2018-12-18 15:26:00 +00:00
  • c1ff17ebb0 Merge branch 'clean-profile' into 'develop' lambda 2018-12-17 19:57:16 +00:00
  • 63ad08050e Fix oauth url Maxim Filippov 2018-12-17 21:58:14 +03:00
  • 485a531d57 clean up the unused stuff Henry Jameson 2018-12-17 21:02:16 +03:00
  • be27494ca1 Make user profile page cleaner Henry Jameson 2018-12-17 20:42:14 +03:00
  • 56fdbf18c5 missing string and unification with counters (order) Henry Jameson 2018-12-17 19:21:05 +03:00
  • bf805361d0 collateral fix for tab display Henry Jameson 2018-12-17 19:18:57 +03:00
  • 292ac59d08 Merge remote-tracking branch 'upstream/develop' into user-profile-overhault Henry Jameson 2018-12-17 19:18:35 +03:00
  • 23d434c40c collateral fixes for user-card: use still-image, styles for custom emoji Henry Jameson 2018-12-17 19:17:03 +03:00
  • 8f255fbad4 Refactor follower/friends out of statuses/timeline into user_profile where it belongs. Changed display of profile to single panel with tabs. Henry Jameson 2018-12-17 19:14:38 +03:00
  • b124dbf44e Merge branch 'captcha' into 'develop' Shpuld Shpludson 2018-12-17 13:36:56 +00:00
  • f671adae37 Redirect to /main/all Maxim Filippov 2018-12-17 03:01:24 +03:00
  • ea6977cd4d Move userProfile link to methods Maxim Filippov 2018-12-17 02:52:27 +03:00
  • 5f10c5e786 Fix user profile test Maxim Filippov 2018-12-17 02:45:40 +03:00
  • 2211c533dd Merge branch 'develop' into feature/new-user-routes Maxim Filippov 2018-12-17 02:39:37 +03:00
  • 5fc0fe28e4 Add temporary redirects Maxim Filippov 2018-12-17 02:26:40 +03:00
  • b524e73a65 Add local profile test Maxim Filippov 2018-12-17 01:53:21 +03:00
  • d2984b9bc5 Fix style Ekaterina Vaartis 2018-12-16 22:55:11 +03:00
  • ab6f1904fa Add a way to get new captcha on click Ekaterina Vaartis 2018-12-16 22:47:52 +03:00
  • 3c9c8052f7 Fix style Ekaterina Vaartis 2018-12-16 20:55:09 +03:00
  • a525df32c9 Separate captcha into the backendInteractor Ekaterina Vaartis 2018-12-16 20:53:41 +03:00
  • ada4bd0d98 Merge branch 'fix-tab-scroll' into 'develop' Shpuld Shpludson 2018-12-16 07:56:29 +00:00
  • 1b9a5a3efe more visual fixes Henry Jameson 2018-12-16 02:35:42 +03:00
  • a1d00b9398 changed bottom-shadow hiding method to be more compatible with overflow Henry Jameson 2018-12-16 02:07:32 +03:00
  • fc7cd6eaf6 small fix for overflowing tab-switcher Henry Jameson 2018-12-16 02:02:49 +03:00
  • bd2ed617a7 Remove panel switcher, add rudimentary drawer shpuld 2018-12-15 19:13:01 +02:00
  • 828b1c78f9 Implement user_profile.spec.js Maxim Filippov 2018-12-15 06:16:44 +03:00
  • eaf065c751 Merge branch 'fix-name' into 'develop' HJ 2018-12-15 00:38:47 +00:00
  • 7d3385f349 fix Henry Jameson 2018-12-15 03:30:39 +03:00
  • 92de235f4e Support disabling captcha Ekaterina Vaartis 2018-12-15 03:06:21 +03:00
  • 9303bd5d36 Base support for CAPTCHA (kocaptcha) Ekaterina Vaartis 2018-12-15 03:05:47 +03:00
  • 4b30ce64c9 Merge branch 'async_follow' into 'develop' Shpuld Shpludson 2018-12-14 17:33:11 +00:00
  • 10a0296aac Merge branch 'fix-hide-network' into 'develop' HJ 2018-12-14 14:51:59 +00:00
  • 7346c54df4 oof Henry Jameson 2018-12-14 17:47:48 +03:00
  • 13fbef4550 slightly changed the code to have less mutations, added comments Henry Jameson 2018-12-14 17:33:48 +03:00
  • 70ff9ce2b5 Merge branch 'fix-preload-nsfw' into 'develop' HJ 2018-12-14 14:25:16 +00:00
  • d7973b0b80 Merge remote-tracking branch 'upstream/develop' into async_follow Henry Jameson 2018-12-14 17:17:58 +03:00
  • a158e75a04 Merge branch 'search-mobile-fixes' into 'develop' HJ 2018-12-14 14:15:26 +00:00
  • b4b819f4f4 more damage control Henry Jameson 2018-12-14 17:14:55 +03:00
  • bd745543b6 Merge remote-tracking branch 'upstream/develop' into search-mobile-fixes Henry Jameson 2018-12-14 17:10:26 +03:00
  • 5b6c1aa97c Merge branch 'fix-chrome' into 'develop' HJ 2018-12-14 11:40:23 +00:00
  • ac80cf868f fix chrome Henry Jameson 2018-12-14 14:35:56 +03:00
  • 54e34c68fc Merge branch 'placeholder_for_server_generated_meta' into 'develop' HJ 2018-12-14 11:11:32 +00:00
  • c5042c07ef Prevent html-minifier to remove placeholder comment in index.html template raeno 2018-12-13 23:35:27 +01:00
  • 107596339c Add placeholder to insert server generated metatags. Related to #430 raeno 2018-12-13 22:29:07 +01:00
  • 99b2b7a203 Merge branch 'feature/file-size-checking' into 'develop' HJ 2018-12-13 21:02:17 +00:00
  • dcca4617d5 Merge branch 'dev_vald_fe/its_you' into 'develop' HJ 2018-12-13 19:56:22 +00:00
  • e2f825266a added condition to check for logined user ValD 2018-12-13 23:11:36 +05:30
  • ad56c8e5bd Merge branch 'collateral-damage-control' into 'develop' Shpuld Shpludson 2018-12-13 17:47:01 +00:00
  • cc259411a7 fix gradients and minor artifacts Henry Jameson 2018-12-13 20:41:23 +03:00
  • e1b523016b keep track of new instance options Henry Jameson 2018-12-13 20:41:01 +03:00
  • 1341a7bb9c Use babel polyfill in karma Maxim Filippov 2018-12-13 20:27:03 +03:00
  • f87001c22f fix old MR Henry Jameson 2018-12-13 20:25:46 +03:00
  • e4a34cc4d4 Use 'userProfileLink' to generate user-profile link Maxim Filippov 2018-12-13 19:57:11 +03:00
  • 70c48a076d Rollback disableDotRule Maxim Filippov 2018-12-13 19:53:14 +03:00
  • ac60550e07 Merge branch 'mobile-back' into 'develop' Shpuld Shpludson 2018-12-13 15:12:27 +00:00
  • 915487072b Merge branch 'fix/reset-follows-export' into 'develop' Shpuld Shpludson 2018-12-13 15:06:50 +00:00
  • aa7cff92aa Merge branch 'feature/configurable-nsfw-censor-image' into 'develop' Shpuld Shpludson 2018-12-13 15:04:55 +00:00
  • dd6a9ae645 oof Rinpatch 2018-12-13 17:51:29 +03:00
  • 25a88da17a Merge branch 'fix_loading_flicker' into 'develop' Shpuld Shpludson 2018-12-13 14:51:27 +00:00
  • 610724ffcd Merge remote-tracking branch 'upstream/develop' into mobile-back Henry Jameson 2018-12-13 17:50:36 +03:00
  • 457132fb37 get rid of slots rinpatch 2018-12-13 15:44:37 +01:00
  • dbe79a3c26 Merge branch 'dev-qol' into 'develop' Shpuld Shpludson 2018-12-13 14:42:58 +00:00
  • c824d25378 Merge branch 'fix_empty_profiles' into 'develop' Shpuld Shpludson 2018-12-13 14:41:57 +00:00
  • ad905576fc Merge branch 'hide_network' into 'develop' Shpuld Shpludson 2018-12-13 14:40:49 +00:00
  • f1c21be77c Merge branch 'fix-timeago' into 'develop' HJ 2018-12-13 14:25:29 +00:00
  • 6de4dcc7c9 Resolve merge conflict Rinpatch 2018-12-13 17:22:19 +03:00
  • ff36d34186 fix timeago font Henry Jameson 2018-12-13 17:20:31 +03:00
  • fa7c3c2097 Merge remote-tracking branch 'upstream/develop' into fix_empty_profiles Henry Jameson 2018-12-13 17:11:22 +03:00
  • 8e4777ccc6 Merge branch 'feature/push-subscriptions' into 'develop' HJ 2018-12-13 13:46:57 +00:00
  • 9dfff10717 Merge remote-tracking branch 'upstream/develop' into async_follow Henry Jameson 2018-12-13 16:15:47 +03:00
  • c52b8019ae added hide_network option, fixed properties naming Henry Jameson 2018-12-13 15:58:38 +03:00
  • 42bb348219 Fix fetching new users, add storing local users in usersObjects with their screen_name as well as id, so that they could be fetched zero-state with screen-name link. Henry Jameson 2018-12-13 15:34:51 +03:00