b124dbf44e
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma-fe!424
2018-12-17 13:36:56 +00:00
f671adae37
Redirect to /main/all
2018-12-17 03:01:24 +03:00
ea6977cd4d
Move userProfile link to methods
2018-12-17 02:52:27 +03:00
5f10c5e786
Fix user profile test
2018-12-17 02:45:40 +03:00
2211c533dd
Merge branch 'develop' into feature/new-user-routes
2018-12-17 02:39:37 +03:00
5fc0fe28e4
Add temporary redirects
2018-12-17 02:26:40 +03:00
b524e73a65
Add local profile test
2018-12-17 01:53:21 +03:00
d2984b9bc5
Fix style
2018-12-16 22:55:11 +03:00
ab6f1904fa
Add a way to get new captcha on click
2018-12-16 22:47:52 +03:00
3c9c8052f7
Fix style
2018-12-16 20:55:09 +03:00
a525df32c9
Separate captcha into the backendInteractor
2018-12-16 20:53:41 +03:00
ada4bd0d98
Merge branch 'fix-tab-scroll' into 'develop'
...
Fix tab scroll
See merge request pleroma/pleroma-fe!426
2018-12-16 07:56:29 +00:00
1b9a5a3efe
more visual fixes
2018-12-16 02:40:32 +03:00
a1d00b9398
changed bottom-shadow hiding method to be more compatible with overflow
2018-12-16 02:07:32 +03:00
fc7cd6eaf6
small fix for overflowing tab-switcher
2018-12-16 02:02:49 +03:00
bd2ed617a7
Remove panel switcher, add rudimentary drawer
2018-12-15 19:13:01 +02:00
828b1c78f9
Implement user_profile.spec.js
2018-12-15 06:16:44 +03:00
eaf065c751
Merge branch 'fix-name' into 'develop'
...
Fix impossible to change name
See merge request pleroma/pleroma-fe!425
2018-12-15 00:38:47 +00:00
7d3385f349
fix
2018-12-15 03:30:39 +03:00
92de235f4e
Support disabling captcha
2018-12-15 03:06:21 +03:00
9303bd5d36
Base support for CAPTCHA (kocaptcha)
2018-12-15 03:05:47 +03:00
4b30ce64c9
Merge branch 'async_follow' into 'develop'
...
Better "follow" button behavior
Closes #133
See merge request pleroma/pleroma-fe!396
2018-12-14 17:33:11 +00:00
10a0296aac
Merge branch 'fix-hide-network' into 'develop'
...
oof
See merge request pleroma/pleroma-fe!422
2018-12-14 14:51:59 +00:00
7346c54df4
oof
2018-12-14 17:47:48 +03:00
13fbef4550
slightly changed the code to have less mutations, added comments
2018-12-14 17:33:48 +03:00
70ff9ce2b5
Merge branch 'fix-preload-nsfw' into 'develop'
...
Fix preload images option being always disabled
See merge request pleroma/pleroma-fe!421
2018-12-14 14:25:16 +00:00
d7973b0b80
Merge remote-tracking branch 'upstream/develop' into async_follow
...
* upstream/develop: (45 commits)
fix chrome
Prevent html-minifier to remove placeholder comment in index.html template
Add placeholder to insert server generated metatags. Related to #430
added condition to check for logined user
fix gradients and minor artifacts
keep track of new instance options
fix old MR
oof
get rid of slots
fix timeago font
added hide_network option, fixed properties naming
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.
improve notification subscription
Refactor arrays to individual options
Reset enableFollowsExport to true after 2 sec when an export file is available to download
Write a unit test for fileSizeFormatService
add checkbox to disable web push
I am dumb
Handle errors from server
Moved upload errors in user_settings to an array. Moved upload error strings to its separate section in i18n
...
2018-12-14 17:17:58 +03:00
a158e75a04
Merge branch 'search-mobile-fixes' into 'develop'
...
Fixes for user-finder on mobile
Closes #188 and #179
See merge request pleroma/pleroma-fe!389
2018-12-14 14:15:26 +00:00
b4b819f4f4
more damage control
2018-12-14 17:14:55 +03:00
bd745543b6
Merge remote-tracking branch 'upstream/develop' into search-mobile-fixes
...
* upstream/develop: (176 commits)
fix chrome
Prevent html-minifier to remove placeholder comment in index.html template
Add placeholder to insert server generated metatags. Related to #430
added condition to check for logined user
fix gradients and minor artifacts
keep track of new instance options
fix old MR
oof
get rid of slots
fix timeago font
added hide_network option, fixed properties naming
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.
improve notification subscription
Fix typo that prevented scope copy from working.
Refactor arrays to individual options
Reset enableFollowsExport to true after 2 sec when an export file is available to download
added check for activatePanel is function or not
addressed PR comments
activate panel on user screen click
added not preload check so hidden toggles asap
...
2018-12-14 17:10:26 +03:00
5b6c1aa97c
Merge branch 'fix-chrome' into 'develop'
...
fix chrome
See merge request pleroma/pleroma-fe!420
2018-12-14 11:40:23 +00:00
ac80cf868f
fix chrome
2018-12-14 14:35:56 +03:00
54e34c68fc
Merge branch 'placeholder_for_server_generated_meta' into 'develop'
...
Add placeholder to insert server generated metatags
See merge request pleroma/pleroma-fe!419
2018-12-14 11:11:32 +00:00
c5042c07ef
Prevent html-minifier to remove placeholder comment in index.html template
2018-12-13 23:35:27 +01:00
107596339c
Add placeholder to insert server generated metatags. Related to #430
2018-12-13 22:29:07 +01:00
99b2b7a203
Merge branch 'feature/file-size-checking' into 'develop'
...
[pleroma#36] Add errors when file uploading fails
See merge request pleroma/pleroma-fe!405
2018-12-13 21:02:17 +00:00
dcca4617d5
Merge branch 'dev_vald_fe/its_you' into 'develop'
...
added condition to check for login user in user search
Closes #182
See merge request pleroma/pleroma-fe!417
2018-12-13 19:56:22 +00:00
e2f825266a
added condition to check for logined user
2018-12-13 23:20:59 +05:30
ad56c8e5bd
Merge branch 'collateral-damage-control' into 'develop'
...
Collateral damage control
See merge request pleroma/pleroma-fe!418
2018-12-13 17:47:01 +00:00
cc259411a7
fix gradients and minor artifacts
2018-12-13 20:41:23 +03:00
e1b523016b
keep track of new instance options
2018-12-13 20:41:01 +03:00
1341a7bb9c
Use babel polyfill in karma
2018-12-13 20:27:03 +03:00
f87001c22f
fix old MR
2018-12-13 20:25:46 +03:00
e4a34cc4d4
Use 'userProfileLink' to generate user-profile link
2018-12-13 19:57:11 +03:00
70c48a076d
Rollback disableDotRule
2018-12-13 19:53:14 +03:00
ac60550e07
Merge branch 'mobile-back' into 'develop'
...
Back button for mobile
Closes #197
See merge request pleroma/pleroma-fe!403
2018-12-13 15:12:27 +00:00
915487072b
Merge branch 'fix/reset-follows-export' into 'develop'
...
Reset enableFollowsExport when an export file is available to download
See merge request pleroma/pleroma-fe!412
2018-12-13 15:06:50 +00:00
aa7cff92aa
Merge branch 'feature/configurable-nsfw-censor-image' into 'develop'
...
make nsfw censor image configurable
See merge request pleroma/pleroma-fe!243
2018-12-13 15:04:55 +00:00
dd6a9ae645
oof
2018-12-13 17:51:29 +03:00
25a88da17a
Merge branch 'fix_loading_flicker' into 'develop'
...
Throttle fetching old statuses to prevent spam, especially during scroll
Closes #176
See merge request pleroma/pleroma-fe!393
2018-12-13 14:51:27 +00:00
Shpuld Shpludson
Maxim Filippov
Ekaterina Vaartis
Henry Jameson
HJ
raeno
ValD
Rinpatch