Commit graph

  • 9303bd5d36 Base support for CAPTCHA (kocaptcha) Ekaterina Vaartis 2018-12-15 03:05:47 +0300
  • 4b30ce64c9 Merge branch 'async_follow' into 'develop' Shpuld Shpludson 2018-12-14 17:33:11 +0000
  • 10a0296aac Merge branch 'fix-hide-network' into 'develop' HJ 2018-12-14 14:51:59 +0000
  • 7346c54df4 oof Henry Jameson 2018-12-14 17:47:48 +0300
  • 13fbef4550 slightly changed the code to have less mutations, added comments Henry Jameson 2018-12-14 17:33:48 +0300
  • 70ff9ce2b5 Merge branch 'fix-preload-nsfw' into 'develop' HJ 2018-12-14 14:25:16 +0000
  • d7973b0b80 Merge remote-tracking branch 'upstream/develop' into async_follow Henry Jameson 2018-12-14 17:17:58 +0300
  • a158e75a04 Merge branch 'search-mobile-fixes' into 'develop' HJ 2018-12-14 14:15:26 +0000
  • b4b819f4f4 more damage control Henry Jameson 2018-12-14 17:14:55 +0300
  • bd745543b6 Merge remote-tracking branch 'upstream/develop' into search-mobile-fixes Henry Jameson 2018-12-14 17:10:26 +0300
  • 5b6c1aa97c Merge branch 'fix-chrome' into 'develop' HJ 2018-12-14 11:40:23 +0000
  • ac80cf868f fix chrome Henry Jameson 2018-12-14 14:35:56 +0300
  • 54e34c68fc Merge branch 'placeholder_for_server_generated_meta' into 'develop' HJ 2018-12-14 11:11:32 +0000
  • c5042c07ef Prevent html-minifier to remove placeholder comment in index.html template raeno 2018-12-13 23:35:27 +0100
  • 107596339c Add placeholder to insert server generated metatags. Related to #430 raeno 2018-12-13 22:29:07 +0100
  • 99b2b7a203 Merge branch 'feature/file-size-checking' into 'develop' HJ 2018-12-13 21:02:17 +0000
  • dcca4617d5 Merge branch 'dev_vald_fe/its_you' into 'develop' HJ 2018-12-13 19:56:22 +0000
  • e2f825266a added condition to check for logined user ValD 2018-12-13 23:11:36 +0530
  • ad56c8e5bd Merge branch 'collateral-damage-control' into 'develop' Shpuld Shpludson 2018-12-13 17:47:01 +0000
  • cc259411a7 fix gradients and minor artifacts Henry Jameson 2018-12-13 20:41:23 +0300
  • e1b523016b keep track of new instance options Henry Jameson 2018-12-13 20:41:01 +0300
  • 1341a7bb9c Use babel polyfill in karma Maxim Filippov 2018-12-13 20:27:03 +0300
  • f87001c22f fix old MR Henry Jameson 2018-12-13 20:25:46 +0300
  • e4a34cc4d4 Use 'userProfileLink' to generate user-profile link Maxim Filippov 2018-12-13 19:57:11 +0300
  • 70c48a076d Rollback disableDotRule Maxim Filippov 2018-12-13 19:53:14 +0300
  • ac60550e07 Merge branch 'mobile-back' into 'develop' Shpuld Shpludson 2018-12-13 15:12:27 +0000
  • 915487072b Merge branch 'fix/reset-follows-export' into 'develop' Shpuld Shpludson 2018-12-13 15:06:50 +0000
  • aa7cff92aa Merge branch 'feature/configurable-nsfw-censor-image' into 'develop' Shpuld Shpludson 2018-12-13 15:04:55 +0000
  • dd6a9ae645 oof Rinpatch 2018-12-13 17:51:29 +0300
  • 25a88da17a Merge branch 'fix_loading_flicker' into 'develop' Shpuld Shpludson 2018-12-13 14:51:27 +0000
  • 610724ffcd Merge remote-tracking branch 'upstream/develop' into mobile-back Henry Jameson 2018-12-13 17:50:36 +0300
  • 457132fb37 get rid of slots rinpatch 2018-12-13 15:44:37 +0100
  • dbe79a3c26 Merge branch 'dev-qol' into 'develop' Shpuld Shpludson 2018-12-13 14:42:58 +0000
  • c824d25378 Merge branch 'fix_empty_profiles' into 'develop' Shpuld Shpludson 2018-12-13 14:41:57 +0000
  • ad905576fc Merge branch 'hide_network' into 'develop' Shpuld Shpludson 2018-12-13 14:40:49 +0000
  • f1c21be77c Merge branch 'fix-timeago' into 'develop' HJ 2018-12-13 14:25:29 +0000
  • 6de4dcc7c9 Resolve merge conflict Rinpatch 2018-12-13 17:22:19 +0300
  • ff36d34186 fix timeago font Henry Jameson 2018-12-13 17:20:31 +0300
  • fa7c3c2097 Merge remote-tracking branch 'upstream/develop' into fix_empty_profiles Henry Jameson 2018-12-13 17:11:22 +0300
  • 8e4777ccc6 Merge branch 'feature/push-subscriptions' into 'develop' HJ 2018-12-13 13:46:57 +0000
  • 9dfff10717 Merge remote-tracking branch 'upstream/develop' into async_follow Henry Jameson 2018-12-13 16:15:47 +0300
  • c52b8019ae added hide_network option, fixed properties naming Henry Jameson 2018-12-13 15:58:38 +0300
  • 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 +0300
  • a8521fc8d9 Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into feature/push-subscriptions Egor Kislitsyn 2018-12-13 18:22:15 +0700
  • b3455649c5 improve notification subscription Egor Kislitsyn 2018-12-13 18:04:09 +0700
  • 7ffb7e6795 Use "-1" in indexOf Maxim Filippov 2018-12-13 13:51:47 +0300
  • e443716bcd Merge branch 'fix-scope-copy' into 'develop' HJ 2018-12-13 10:39:50 +0000
  • 9f48055261 Fix typo that prevented scope copy from working. Henry Jameson 2018-12-13 13:34:47 +0300
  • 48edc0c8fc Refactor arrays to individual options Rinpatch 2018-12-13 11:25:03 +0300
  • 24caa2cfcd Add generateProfileLink Maxim Filippov 2018-12-13 05:00:01 +0300
  • 33c2d21bb7 Reset enableFollowsExport to true after 2 sec when an export file is available to download link0ff 2018-12-12 22:00:04 +0200
  • 2077927ff3 Merge branch 'dev_vald_fe/user_name_panel' into 'develop' HJ 2018-12-12 19:31:15 +0000
  • ce6d75331b added check for activatePanel is function or not ValD 2018-12-13 00:56:04 +0530
  • 7325ff2e7a Merge branch 'dev_vald_fe/nsfw_preload' into 'develop' HJ 2018-12-12 19:01:53 +0000
  • f0fb6e6015 Merge branch 'dev_vald_fe/timeago_panel' into 'develop' HJ 2018-12-12 18:47:56 +0000
  • 13ef05d5e6 Merge branch 'dev_vald_fe/user_panel_counts' into 'develop' HJ 2018-12-12 18:47:09 +0000
  • 481c5ecba8 addressed PR comments ValD 2018-12-11 19:25:12 +0530
  • e3848f6efb activate panel on user screen click ValD 2018-12-11 02:21:24 +0530
  • b271957b4c added not preload check so hidden toggles asap ValD 2018-12-13 00:11:01 +0530
  • 33b962b13e removed counters from left panel ValD 2018-12-12 23:56:12 +0530
  • 7556efa04f added router-links to all relavent links ValD 2018-12-11 20:06:55 +0530
  • 1623dcb417 added activatePanel onclick for timeago button ValD 2018-12-11 01:42:51 +0530
  • 7c6c2cfb22 added PR comments ValD 2018-12-12 23:29:13 +0530
  • fa7fbe05de Write a unit test for fileSizeFormatService Rinpatch 2018-12-12 20:41:12 +0300
  • 02c0e15781 add checkbox to disable web push Egor Kislitsyn 2018-12-13 00:03:50 +0700
  • 9c24ac1d05 I am dumb Rinpatch 2018-12-12 20:01:37 +0300
  • 5ca2e75df3 Handle errors from server Rinpatch 2018-12-12 19:31:16 +0300
  • 6d3bd95bfe removed brackets from condition ValD 2018-12-12 15:07:07 +0000
  • bf8bb9ce13 Moved upload errors in user_settings to an array. Moved upload error strings to its separate section in i18n Rinpatch 2018-12-12 16:38:01 +0300
  • de5d846ebd resolved lint issue ValD 2018-12-12 03:44:45 +0530
  • 139659d42c renamed config to preload images and add ident to config ValD 2018-12-12 03:42:29 +0530
  • 7b4e08dd93 added config for preload and made attachment responsive to it ValD 2018-12-12 03:33:53 +0530
  • b195ce12e1 preload nsfw image ValD 2018-12-12 02:28:36 +0530
  • a8acba8cb2 Merge branch 'feature/theming2' into 'develop' HJ 2018-12-11 20:35:19 +0000
  • 8fcc4c6766 fix Henry Jameson 2018-12-11 19:09:00 +0300
  • c54eb1ecad fix Henry Jameson 2018-12-11 19:01:08 +0300
  • 4eb075fae7 whoopsies Henry Jameson 2018-12-11 18:57:24 +0300
  • b2d3b7e708 fix Henry Jameson 2018-12-11 18:54:17 +0300
  • b839ba7870 Quality of Frontend Developer's Life: here to stay Henry Jameson 2018-12-11 18:45:25 +0300
  • c3f8b713a7 fixed wrong height for selects Henry Jameson 2018-12-11 16:37:03 +0300
  • 83b85cd412 better layouting for import-export, error display fixes Henry Jameson 2018-12-11 16:36:27 +0300
  • c189a08dff added keep-colors option Henry Jameson 2018-12-11 16:36:06 +0300
  • 25a04f2294 Avatar, background, banner filesize errors Rinpatch 2018-12-11 16:02:35 +0300
  • 51dccb7887 separated preview and exported from style_switcher Henry Jameson 2018-12-11 02:46:17 +0300
  • a17ac74df7 revert that, it's actually used, i'm an idiot Henry Jameson 2018-12-11 02:05:22 +0300
  • 90a5670661 removed unused function from color_convert Henry Jameson 2018-12-11 01:41:19 +0300
  • 73aa9153d9 cleanup Henry Jameson 2018-12-11 01:40:19 +0300
  • 4b25475b57 setColors -> applyTheme. For sanity. Also disabled export because nobody uses it and should not use anyway. Henry Jameson 2018-12-11 01:39:18 +0300
  • fe2fe09236 fixed v2 setting as default theme Henry Jameson 2018-12-11 01:38:20 +0300
  • 3452864260 Merge remote-tracking branch 'upstream/develop' into feature/theming2 Henry Jameson 2018-12-11 01:01:16 +0300
  • aeecd2b09b separate font control js Henry Jameson 2018-12-11 00:56:15 +0300
  • ee70ec4c7e fix race condition Egor Kislitsyn 2018-12-10 22:36:25 +0700
  • 6a00854189 Count in binary bytes and remove i18 from file size format service Rinpatch 2018-12-10 17:06:32 +0300
  • 88145c5934 Add a space between filesizes Rinpatch 2018-12-10 10:04:42 +0300
  • 5c7a316df9 Lint Rinpatch 2018-12-10 09:56:07 +0300
  • c69a8dc197 Add file size formating Rinpatch 2018-12-10 09:50:04 +0300
  • ae8f0f36d8 Use "~" as a route namespace symbol Maxim Filippov 2018-12-10 01:21:52 +0300
  • 73b17d70ec improve push notifications code Egor Kislitsyn 2018-12-09 19:25:43 +0700
  • 4fde987e34 Fix formating rinpatch 2018-12-08 22:39:58 +0100
  • f69331e49d Improve error messages rinpatch 2018-12-08 22:36:54 +0100