aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'feature/autoresize-post-status-form' into 'develop' lambadalambda2017-06-01
|\ | | | | | | | | Make text input grow to a minimum height of 3 lines on focus See merge request !82
| * please the linterShpuld Shpuldson2017-05-31
| |
| * Set minimum height of 3 lines for textarea on focus, make it reset on post.Shpuld Shpuldson2017-05-31
| |
* | Merge branch 'feature/notification-improvements' into 'develop' lambadalambda2017-05-31
|\ \ | | | | | | | | | | | | Feature/notification improvements See merge request !79
| * | Revert main.js to what it was in developShpuld Shpuldson2017-05-31
| | |
| * | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into ↵Shpuld Shpuldson2017-05-31
| |\ \ | | | | | | | | | | | | feature/notification-improvements
| * | | Enable reply/rt/fav for mention notifications by using a barebones status in ↵Shpuld Shpuldson2017-05-31
| | | | | | | | | | | | | | | | place of plain notification content.
| * | | Cut notification header length from 3 lines to 1.Shpuld Shpuldson2017-05-30
| | | |
| * | | Make linter happy.Roger Braun2017-04-24
| | | |
| * | | Merge branch 'develop' into feature/hash-routedRoger Braun2017-04-24
| |\ \ \
| * \ \ \ Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into ↵Shpuld Shpuldson2017-04-21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | feature/hash-routed
| * \ \ \ \ Merge branch 'develop' into feature/hash-routedRoger Braun2017-04-09
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into feature/hash-routedRoger Braun2017-03-10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into feature/hash-routedRoger Braun2017-03-09
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' into feature/hash-routedRoger Braun2017-02-26
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'develop' into feature/hash-routedRoger Braun2017-02-21
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'develop' into feature/hash-routedRoger Braun2017-02-21
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into feature/hash-routedRoger Braun2017-02-20
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into feature/hash-routedRoger Braun2017-02-18
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into feature/hash-routedRoger Braun2017-02-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into feature/hash-routedRoger Braun2017-02-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into feature/hash-routedRoger Braun2017-02-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix file uploads in Chrome.Roger Braun2017-01-20
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix style setting in Chrome.Roger Braun2017-01-20
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'develop' into feature/hash-routedRoger Braun2017-01-17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into feature/hash-routedRoger Braun2017-01-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into feature/hash-routedRoger Braun2017-01-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Use hash routing.Roger Braun2017-01-02
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'feature/custom-timestamps' into 'develop' lambadalambda2017-05-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a custom timeago.json for shorter timestamps, for example '15s' instead of '15 seconds ago' See merge request !80
| * | | | | | | | | | | | | | | | | | | | Add a custom timeago.json for shorter timestamps, for example '15s' instead ↵Shpuld Shpuldson2017-05-31
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of '15 seconds ago'
* | | | | | | | | | | | | | | | | | | | Merge branch 'feature/autoresize-post-status-form' into 'develop' lambadalambda2017-05-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | Make post-status-form textarea automatically resize to fit the input. See merge request !81
| * | | | | | | | | | | | | | | | | | eslint fixShpuld Shpuldson2017-05-31
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Make post-status-form automatically resize to fit the input.Shpuld Shpuldson2017-05-31
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Copy cool retweet look.Roger Braun2017-05-22
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into developRoger Braun2017-05-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Make linter happy.Roger Braun2017-04-24
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Remove tributejsRoger Braun2017-04-24
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alternative autocompletion is in the works and this one has injection problems.
* / | | | | | | | | | | | | | | | Add user finder.Roger Braun2017-05-12
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'feature/post-form-improvement' into 'develop' lambadalambda2017-04-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Polish up post-status form See merge request !78
| * | | | | | | | | | | | | | | | Adjust attachment preview margins.Shpuld Shpuldson2017-04-17
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into ↵Shpuld Shpuldson2017-04-17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/post-form-improvement
* | | | | | | | | | | | | | | | | Merge branch 'fix/floating-attachment-remove-x' into 'develop' Shpuld Shpuldson2017-04-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the floating 'remove attachment' icon on post status form. See merge request !77
| * | | | | | | | | | | | | | | | | Make X icon parent position: relative; to prevent it from floating on its own.Shpuld Shpuldson2017-04-17
|/ / / / / / / / / / / / / / / / /
| * / / / / / / / / / / / / / / / Move attachments below buttons to prevent the buttons from shifting after ↵Shpuld Shpuldson2017-04-17
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uploading.
* | | | | | | | | | | | | | | | Merge branch 'fix/add-explicit-lang-to-html' into 'develop' lambadalambda2017-04-15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix / add explicit lang="en" to html See merge request !75
| * | | | | | | | | | | | | | | | Add lang="en" to html to potentially fix font fall-back issues on some ↵Shpuld Shpuldson2017-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | language/font setups.
* | | | | | | | | | | | | | | | | Add missing route-link end tags.Roger Braun2017-04-14
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'feature/reply-navigation' into 'develop' lambadalambda2017-04-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reply navigation fix for opening conversations in new tab See merge request !74
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into ↵Shpuld Shpuldson2017-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/reply-navigation
* | | | | | | | | | | | | | | | | Merge branch 'feature/sidepanel-independent-scrolling' into 'develop' lambadalambda2017-04-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sidepanel independent scrolling See merge request !72