Henry Jameson
3ca8f5a214
sgsgb def
2018-09-25 16:27:57 +03:00
Henry Jameson
41ee42e03f
Merge branch 'feature/scope_preferences' into shigusegubu
...
* feature/scope_preferences:
lint fix
now it actually works
settings for scope/subject
2018-09-25 16:25:04 +03:00
Henry Jameson
9c4bac08d6
Merge remote-tracking branch 'upstream/develop' into shigusegubu
...
* upstream/develop:
i think it's due to my shitty js-to-json regex
src/i18n/fr.json: More accurate translation
update Japanese translation
update french translation
add support for disabling rich text formatting
small thing to display instance-provided default
console.log cleanup
More languages
added usage
a tool to check what's missing from a language
all other languages which do not have MRs related to them separated
2018-09-25 16:24:52 +03:00
Henry Jameson
d5e82625d3
lint fix
2018-09-25 15:21:47 +03:00
Henry Jameson
ef968d8e1e
now it actually works
2018-09-25 15:16:26 +03:00
Henry Jameson
6165b7366a
Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
...
* upstream/develop:
i think it's due to my shitty js-to-json regex
2018-09-25 14:48:02 +03:00
Henry Jameson
455cd0d028
settings for scope/subject
2018-09-25 14:47:02 +03:00
Henry
9d0bbe37e6
Merge branch 'fix/i18n/instance_default' into 'develop'
...
Fix instance_default in en and fr
See merge request pleroma/pleroma-fe!352
2018-09-25 11:38:56 +00:00
Henry Jameson
85235981d1
i think it's due to my shitty js-to-json regex
2018-09-25 14:30:05 +03:00
Henry Jameson
11f1bac502
Less confusing description
2018-09-25 14:01:01 +03:00
Henry
bfd2b45672
Merge branch 'fixup_french_translation' into 'develop'
...
Fixup french translation
See merge request pleroma/pleroma-fe!350
2018-09-24 15:10:47 +00:00
Haelwenn (lanodan) Monnier
8cb62fae70
src/i18n/fr.json: More accurate translation
2018-09-24 16:55:19 +02:00
Henry
40210ae31b
Merge branch 'update-japanese-translation' into 'develop'
...
Update Japanese translation
See merge request pleroma/pleroma-fe!349
2018-09-24 10:43:18 +00:00
hakabahitoyo
86528d84e2
update Japanese translation
2018-09-23 10:27:05 +09:00
kaniini
01127c2db0
Merge branch 'update/french-translation' into 'develop'
...
update french translation
See merge request pleroma/pleroma-fe!348
2018-09-22 04:53:38 +00:00
William Pitcock
2f674eb13d
update french translation
2018-09-22 04:46:09 +00:00
kaniini
1cbabf31ee
Merge branch 'feature/rich-text-optout' into 'develop'
...
add support for disabling rich text formatting
See merge request pleroma/pleroma-fe!347
2018-09-22 04:44:02 +00:00
William Pitcock
1af5c8fd39
add support for disabling rich text formatting
2018-09-22 03:54:05 +00:00
Henry
cd48268c85
Merge branch 'betterStorage' into 'develop'
...
Better storage
See merge request pleroma/pleroma-fe!343
2018-09-21 09:19:02 +00:00
Henry Jameson
1c2f0029e4
Merge remote-tracking branch 'upstream/develop' into betterStorage
...
* upstream/develop:
More languages
added usage
a tool to check what's missing from a language
all other languages which do not have MRs related to them separated
seems to be working
2018-09-21 12:14:20 +03:00
Henry
6f32ccf417
Merge branch 'translations-separation' into 'develop'
...
Separation of translation file into several smaller ones.
Closes #142
See merge request pleroma/pleroma-fe!337
2018-09-21 09:02:01 +00:00
Henry Jameson
a61ad0544a
small thing to display instance-provided default
2018-09-20 17:21:11 +03:00
Henry Jameson
537b1ff2d8
Merge remote-tracking branch 'upstream/develop' into translations-separation
...
* upstream/develop:
Update Hebrew translation
fixed autocomplete
Debug
2018-09-20 16:12:00 +03:00
Henry Jameson
419744080f
console.log cleanup
2018-09-17 19:16:58 +03:00
Henry Jameson
16c1f8eb36
console.log cleanup
2018-09-17 19:16:33 +03:00
Henry Jameson
b0af6b572c
Merge branch 'betterStorage' into shigusegubu
...
* betterStorage:
Fixed "user.id is undefined" or something error more sane by properly handling HTTP errors
undo rename because it makes less sense now.
proxying nodeinfo
made FE work even without either api or static config
Removed warning. Added support for working without static/config.json
more missing stuff
fix some missing stuff
translations
Added more stuff that's actually being added to instanceConfig, simplified the whitelist.
more refactoring
some recategorization of options...
Initial version
2018-09-17 19:08:41 +03:00
Henry Jameson
3fe199ac0e
Merge remote-tracking branch 'upstream/develop' into shigusegubu
...
* upstream/develop:
Update Hebrew translation
Debug
2018-09-17 19:02:18 +03:00
Henry Jameson
03f28d3fa6
Fixed "user.id is undefined" or something error more sane by properly handling
...
HTTP errors
2018-09-17 18:55:11 +03:00
Henry Jameson
e53f238278
undo rename because it makes less sense now.
2018-09-17 18:54:48 +03:00
Henry Jameson
347c2c02df
proxying nodeinfo
2018-09-17 18:54:34 +03:00
Henry Jameson
9467462ef0
made FE work even without either api or static config
2018-09-17 18:54:08 +03:00
Henry Jameson
40a175389a
Removed warning. Added support for working without static/config.json
2018-09-17 18:00:56 +03:00
Henry Jameson
394153380d
more missing stuff
2018-09-17 17:51:39 +03:00
Henry Jameson
136add8a2f
fix some missing stuff
2018-09-17 17:51:39 +03:00
Henry Jameson
1245d7917f
translations
2018-09-17 17:51:39 +03:00
Henry Jameson
580aae1b54
Added more stuff that's actually being added to instanceConfig, simplified the whitelist.
2018-09-17 17:51:39 +03:00
Henry Jameson
82fa5d08c4
more refactoring
2018-09-17 17:51:39 +03:00
Henry Jameson
2db991fc7f
some recategorization of options...
2018-09-17 17:51:39 +03:00
Henry Jameson
f1c16327b6
Initial version
2018-09-17 17:51:39 +03:00
kaniini
7887e42fca
Merge branch 'fixAutocomplete' into 'develop'
...
Fixes broken autocomplete for users
See merge request pleroma/pleroma-fe!344
2018-09-13 19:30:28 +00:00
Henry
9989ad29df
Merge branch 'patch-1' into 'develop'
...
Update Hebrew translation
See merge request pleroma/pleroma-fe!345
2018-09-12 16:43:19 +00:00
Artik Banana
9b95c4c7b5
Update Hebrew translation
2018-09-12 16:16:55 +00:00
Henry
c94b9796ae
Merge branch 'debug-who-to-follow-panel' into 'develop'
...
Small debug for Who to follow panel
See merge request pleroma/pleroma-fe!342
2018-09-12 08:53:13 +00:00
Henry Jameson
1ee7dd7739
Merge branch 'fixAutocomplete' into shigusegubu
...
* fixAutocomplete:
fixed autocomplete
2018-09-12 11:48:08 +03:00
Henry Jameson
89f9b3a468
fixed autocomplete
2018-09-12 11:46:02 +03:00
Henry Jameson
095278f6dd
Merge branch 'betterStorage' into shigusegubu
...
* betterStorage:
more missing stuff
2018-09-09 22:31:52 +03:00
Henry Jameson
c09dcd9c05
more missing stuff
2018-09-09 22:31:34 +03:00
Henry Jameson
094956bf08
Merge branch 'betterStorage' into shigusegubu
...
* betterStorage:
fix some missing stuff
2018-09-09 22:02:44 +03:00
Henry Jameson
88a51bed46
fix some missing stuff
2018-09-09 22:02:22 +03:00
Henry Jameson
cbe81fbd86
Merge branch 'betterStorage' into shigusegubu
...
* betterStorage:
translations
Added more stuff that's actually being added to instanceConfig, simplified the whitelist.
more refactoring
some recategorization of options...
Initial version
seems to be working
2018-09-09 21:58:21 +03:00