aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'develop' into 'develop'lambda2018-05-03
|\ | | | | | | | | Add favicon to pleroma-fe See merge request pleroma/pleroma-fe!248
| * Add favicon to pleroma-feRX142018-04-26
| |
* | Merge branch 'develop' into 'develop'lambda2018-04-29
|\ \ | | | | | | | | | | | | Added a complete Esperanto translation. See merge request pleroma/pleroma-fe!240
| * | Added Esperanto to the list of language codes.Tirifto2018-04-21
| | |
| * | Added a complete Esperanto translation.Tirifto2018-04-21
| | |
* | | Merge branch 'nb' into 'develop'lambda2018-04-29
|\ \ \ | | | | | | | | | | | | | | | | Add Norwegian localization See merge request pleroma/pleroma-fe!241
| * | | Add Norwegian localizationmorguldir2018-04-21
| |/ /
* | | Merge branch 'feature/redirect-root-by-login-or-not' into 'develop'lambda2018-04-29
|\ \ \ | | | | | | | | | | | | | | | | Redirect root by login ro not login See merge request pleroma/pleroma-fe!251
| * | | lintHakaba Hitoyo2018-04-29
| | | |
| * | | lintHakaba Hitoyo2018-04-29
| | | |
| * | | redirect root by login or notHakaba Hitoyo2018-04-29
| | | |
| * | | add redirectRootNoLogin and redirectRootLogin configurationHakaba Hitoyo2018-04-29
| | | |
* | | | Add message preset functionality.Roger Braun2018-04-29
|/ / /
* | | Merge branch 'develop' into csaurus/pleroma-fe-fix-chrome-auto-loadingRoger Braun2018-04-27
|\ \ \
| * | | Fix specs.Roger Braun2018-04-26
| | |/ | |/|
| * | Merge branch 'feature/collapse-chat-by-default' into 'develop'lambda2018-04-24
| |\ \ | | | | | | | | | | | | | | | | Collapse chat by default See merge request pleroma/pleroma-fe!246
| | * | Collapse chat by defaultHakaba Hitoyo2018-04-24
| |/ /
| * | Fix nsfw in notifications again.Roger Braun2018-04-23
| | |
| * | Fix repeat nsfw hiding.Roger Braun2018-04-23
| |/
* | Update timeline.jslambda2018-04-22
| |
* | Stop blink from loading more statuses with every scroll.csaurus2018-04-22
|/
* Merge branch 'patch-4' into 'develop'Shpuld Shpludson2018-04-19
|\ | | | | | | | | Small Update messages.js [OC] See merge request pleroma/pleroma-fe!239
| * Small Update messages.js [OC]Exilat2018-04-19
|/
* Merge branch 'patch-5' into 'develop'Shpuld Shpludson2018-04-17
|\ | | | | | | | | Translated the latest update to french See merge request pleroma/pleroma-fe!237
| * Update messages.jsAzurolu2018-04-15
| |
| * Update messages.jsAzurolu2018-04-15
| |
| * Translated the latest update to frenchAzurolu2018-04-15
| |
* | Merge branch 'fix/follow-import-typo' into 'develop'lambda2018-04-17
|\ \ | | | | | | | | | | | | Fix follow import typo. See merge request pleroma/pleroma-fe!238
| * | Fix follow import typo.eal2018-04-17
|/ /
* | Merge branch 'fix/no-nsfw-in-repeats' into developshpuld2018-04-16
|\ \
| * | Copy parent status nsfw into retweeted_statusshpuld2018-04-16
| |/
* / some ugly hack to prevent the jump in form height when you input first charactershpuld2018-04-16
|/
* Merge branch 'patch-4' into 'develop'Shpuld Shpludson2018-04-15
|\ | | | | | | | | French translation updated See merge request pleroma/pleroma-fe!236
| * Update messages.jsAzurolu2018-04-15
|/
* Merge branch 'fix/additionalInputboxHeightUpdates' into 'develop'Shpuld Shpludson2018-04-15
|\ | | | | | | | | Fix/additional inputbox height updates See merge request pleroma/pleroma-fe!235
| * fmlHenry Jameson2018-04-15
| |
| * better approachHenry Jameson2018-04-15
| |
| * Added resizing inputbox on focus so that replying to The Discourse™ is ↵Henry Jameson2018-04-15
| | | | | | | | less painful
* | Merge branch 'patch-3' into 'develop'Shpuld Shpludson2018-04-15
|\ \ | |/ |/| | | | | Update messages.js: Added "streaming" french translation and corrected typo. See merge request pleroma/pleroma-fe!221
| * Update messages.js: Added "streaming" french translation and corrected typo.Azurolu2018-04-07
| |
* | Additional check to make console shut upshpuld2018-04-15
| |
* | I broke timelines again, fixed now again (hopefully).shpuld2018-04-14
| |
* | Whoops, broke older statuses accidentallyshpuld2018-04-14
| |
* | Merge branch 'fix/add-back-timeline-id-overlap' into developshpuld2018-04-14
|\ \
| * | remove +1/-1 from min/max id checkingshpuld2018-04-14
| | |
* | | Force oembeds to use 100% widthshpuld2018-04-14
|/ /
* | Fix rt heading alignment againshpuld2018-04-14
| |
* | Merge branch 'develop' into fix/status-heading-alignment-issuesshpuld2018-04-14
|\ \
| * \ Merge branch 'fix/better-timeline-min-max-id-behavior' into 'develop'Shpuld Shpludson2018-04-14
| |\ \ | | | | | | | | | | | | | | | | Fix/better timeline min max id behavior See merge request pleroma/pleroma-fe!233
| | * | Fix timeline error not using correct styling while at itshpuld2018-04-13
| | | |