 Maxim Filippov
|
828b1c78f9
Implement user_profile.spec.js
|
6 years ago |
|
HJ
|
eaf065c751
Merge branch 'fix-name' into 'develop'
|
6 years ago |
|
Henry Jameson
|
7d3385f349
fix
|
6 years ago |
|
Ekaterina Vaartis
|
92de235f4e
Support disabling captcha
|
6 years ago |
|
Ekaterina Vaartis
|
9303bd5d36
Base support for CAPTCHA (kocaptcha)
|
6 years ago |
|
Shpuld Shpludson
|
4b30ce64c9
Merge branch 'async_follow' into 'develop'
|
6 years ago |
|
HJ
|
10a0296aac
Merge branch 'fix-hide-network' into 'develop'
|
6 years ago |
|
Henry Jameson
|
7346c54df4
oof
|
6 years ago |
|
Henry Jameson
|
13fbef4550
slightly changed the code to have less mutations, added comments
|
6 years ago |
|
HJ
|
70ff9ce2b5
Merge branch 'fix-preload-nsfw' into 'develop'
|
6 years ago |
|
Henry Jameson
|
d7973b0b80
Merge remote-tracking branch 'upstream/develop' into async_follow
|
6 years ago |
|
HJ
|
a158e75a04
Merge branch 'search-mobile-fixes' into 'develop'
|
6 years ago |
|
Henry Jameson
|
b4b819f4f4
more damage control
|
6 years ago |
|
Henry Jameson
|
bd745543b6
Merge remote-tracking branch 'upstream/develop' into search-mobile-fixes
|
6 years ago |
|
HJ
|
5b6c1aa97c
Merge branch 'fix-chrome' into 'develop'
|
6 years ago |
|
Henry Jameson
|
ac80cf868f
fix chrome
|
6 years ago |
|
HJ
|
54e34c68fc
Merge branch 'placeholder_for_server_generated_meta' into 'develop'
|
6 years ago |
|
raeno
|
c5042c07ef
Prevent html-minifier to remove placeholder comment in index.html template
|
6 years ago |
|
raeno
|
107596339c
Add placeholder to insert server generated metatags. Related to #430
|
6 years ago |
|
HJ
|
99b2b7a203
Merge branch 'feature/file-size-checking' into 'develop'
|
6 years ago |
|
HJ
|
dcca4617d5
Merge branch 'dev_vald_fe/its_you' into 'develop'
|
6 years ago |
|
ValD
|
e2f825266a
added condition to check for logined user
|
6 years ago |
|
Shpuld Shpludson
|
ad56c8e5bd
Merge branch 'collateral-damage-control' into 'develop'
|
6 years ago |
|
Henry Jameson
|
cc259411a7
fix gradients and minor artifacts
|
6 years ago |
|
Henry Jameson
|
e1b523016b
keep track of new instance options
|
6 years ago |
|
Maxim Filippov
|
1341a7bb9c
Use babel polyfill in karma
|
6 years ago |
|
Henry Jameson
|
f87001c22f
fix old MR
|
6 years ago |
|
Maxim Filippov
|
e4a34cc4d4
Use 'userProfileLink' to generate user-profile link
|
6 years ago |
|
Maxim Filippov
|
70c48a076d
Rollback disableDotRule
|
6 years ago |
|
Shpuld Shpludson
|
ac60550e07
Merge branch 'mobile-back' into 'develop'
|
6 years ago |
|
Shpuld Shpludson
|
915487072b
Merge branch 'fix/reset-follows-export' into 'develop'
|
6 years ago |
|
Shpuld Shpludson
|
aa7cff92aa
Merge branch 'feature/configurable-nsfw-censor-image' into 'develop'
|
6 years ago |
|
Rinpatch
|
dd6a9ae645
oof
|
6 years ago |
|
Shpuld Shpludson
|
25a88da17a
Merge branch 'fix_loading_flicker' into 'develop'
|
6 years ago |
|
Henry Jameson
|
610724ffcd
Merge remote-tracking branch 'upstream/develop' into mobile-back
|
6 years ago |
|
rinpatch
|
457132fb37
get rid of slots
|
6 years ago |
|
Shpuld Shpludson
|
dbe79a3c26
Merge branch 'dev-qol' into 'develop'
|
6 years ago |
|
Shpuld Shpludson
|
c824d25378
Merge branch 'fix_empty_profiles' into 'develop'
|
6 years ago |
|
Shpuld Shpludson
|
ad905576fc
Merge branch 'hide_network' into 'develop'
|
6 years ago |
|
HJ
|
f1c21be77c
Merge branch 'fix-timeago' into 'develop'
|
6 years ago |
|
Rinpatch
|
6de4dcc7c9
Resolve merge conflict
|
6 years ago |
|
Henry Jameson
|
ff36d34186
fix timeago font
|
6 years ago |
|
Henry Jameson
|
fa7c3c2097
Merge remote-tracking branch 'upstream/develop' into fix_empty_profiles
|
6 years ago |
|
HJ
|
8e4777ccc6
Merge branch 'feature/push-subscriptions' into 'develop'
|
6 years ago |
|
Henry Jameson
|
9dfff10717
Merge remote-tracking branch 'upstream/develop' into async_follow
|
6 years ago |
|
Henry Jameson
|
c52b8019ae
added hide_network option, fixed properties naming
|
6 years ago |
|
Henry Jameson
|
42bb348219
Fix fetching new users, add storing local users in usersObjects with their
|
6 years ago |
|
Egor Kislitsyn
|
a8521fc8d9
Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into feature/push-subscriptions
|
6 years ago |
|
Egor Kislitsyn
|
b3455649c5
improve notification subscription
|
6 years ago |
|
Maxim Filippov
|
7ffb7e6795
Use "-1" in indexOf
|
6 years ago |
