Eugen Rochko
|
3bddd647e0
|
Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown
|
2017-01-09 14:10:32 +01:00 |
|
Eugen Rochko
|
4293e132d1
|
Persist UI settings, add missing localizations for German
|
2017-01-09 14:00:55 +01:00 |
|
Eugen Rochko
|
75f80bef10
|
Persist UI settings, add missing localizations for German
|
2017-01-09 14:00:55 +01:00 |
|
Eugen Rochko
|
c1c814e6a1
|
Improve initialState loading
|
2017-01-09 12:37:53 +01:00 |
|
Eugen Rochko
|
23ebf60b95
|
Improve initialState loading
|
2017-01-09 12:37:53 +01:00 |
|
blackle
|
62167338b8
|
Generate key for each input so we can upload the same file even after deleting
|
2017-01-08 21:00:13 -05:00 |
|
blackle
|
131bae89fd
|
Generate key for each input so we can upload the same file even after deleting
|
2017-01-08 21:00:13 -05:00 |
|
blackle
|
a697b5473a
|
Switch to compose view when tapping 'mention' in dropdown on mobile
|
2017-01-08 17:12:00 -05:00 |
|
blackle
|
d64c454cfe
|
Switch to compose view when tapping 'mention' in dropdown on mobile
|
2017-01-08 17:12:00 -05:00 |
|
Eugen Rochko
|
f29df16eea
|
Fix Paperclip timeout setting. Fix bug introduced in #437
|
2017-01-08 19:12:54 +01:00 |
|
Eugen Rochko
|
2e71bb031b
|
Fix Paperclip timeout setting. Fix bug introduced in #437
|
2017-01-08 19:12:54 +01:00 |
|
Eugen
|
9f3e2737e9
|
Merge pull request #443 from blackle/master
Add call-to developers on getting started page
|
2017-01-08 13:36:02 +01:00 |
|
Eugen
|
38bc85e695
|
Merge pull request #443 from blackle/master
Add call-to developers on getting started page
|
2017-01-08 13:36:02 +01:00 |
|
Eugen
|
2ee3e2f4a4
|
Merge pull request #446 from blackle/dropdown2
Expand dropdown leftways on status view
|
2017-01-08 13:34:27 +01:00 |
|
Eugen
|
a8e30060ae
|
Merge pull request #446 from blackle/dropdown2
Expand dropdown leftways on status view
|
2017-01-08 13:34:27 +01:00 |
|
blackle
|
9d66dfecf6
|
Expand dropdown leftways on status view
|
2017-01-08 06:32:37 -05:00 |
|
blackle
|
05e964688d
|
Expand dropdown leftways on status view
|
2017-01-08 06:32:37 -05:00 |
|
blackle
|
1adfe59c14
|
Add call-to developers on getting started page
|
2017-01-08 00:23:22 -05:00 |
|
blackle
|
b4f09bae1d
|
Add call-to developers on getting started page
|
2017-01-08 00:23:22 -05:00 |
|
Eugen
|
72843ea705
|
Merge pull request #437 from krainboltgreene/patch-1
Simplifying followers mappings
|
2017-01-08 04:14:54 +01:00 |
|
Eugen
|
69643338f6
|
Merge pull request #437 from krainboltgreene/patch-1
Simplifying followers mappings
|
2017-01-08 04:14:54 +01:00 |
|
Eugen
|
c65508da26
|
Merge pull request #436 from krainboltgreene/patch-2
Less complicated determination of subscription
|
2017-01-08 04:00:22 +01:00 |
|
Eugen
|
e8d6f6c8c1
|
Merge pull request #436 from krainboltgreene/patch-2
Less complicated determination of subscription
|
2017-01-08 04:00:22 +01:00 |
|
Eugen
|
5bbd50e180
|
Update badges
|
2017-01-08 03:47:33 +01:00 |
|
Eugen
|
db8a088502
|
Update badges
|
2017-01-08 03:47:33 +01:00 |
|
Kurtis Rainbolt-Greene
|
5cecff7f2a
|
Simplifying followers mappings
Deduplicating some logic and switching to pluck, to avoid pulling the entire model in memory.
|
2017-01-07 18:09:00 -08:00 |
|
Kurtis Rainbolt-Greene
|
abe3ae1cc2
|
Simplifying followers mappings
Deduplicating some logic and switching to pluck, to avoid pulling the entire model in memory.
|
2017-01-07 18:09:00 -08:00 |
|
Kurtis Rainbolt-Greene
|
ff835f3377
|
Less complicated determination
|
2017-01-07 17:59:51 -08:00 |
|
Kurtis Rainbolt-Greene
|
4a7e3e5082
|
Less complicated determination
|
2017-01-07 17:59:51 -08:00 |
|
Eugen
|
e715e3e009
|
Merge pull request #434 from vjackson725/fix_vagrantfile
Fix Vagrantfile to include yarn
|
2017-01-08 02:58:43 +01:00 |
|
Eugen
|
6d097d559b
|
Merge pull request #434 from vjackson725/fix_vagrantfile
Fix Vagrantfile to include yarn
|
2017-01-08 02:58:43 +01:00 |
|
Eugen
|
e7132be958
|
Merge pull request #435 from krainboltgreene/patch-1
Using "rails style" order arguments
|
2017-01-08 02:58:19 +01:00 |
|
Eugen
|
4447c4c7c8
|
Merge pull request #435 from krainboltgreene/patch-1
Using "rails style" order arguments
|
2017-01-08 02:58:19 +01:00 |
|
Kurtis Rainbolt-Greene
|
82b0eb2ae4
|
Using "rails style" order arguments
|
2017-01-07 17:55:40 -08:00 |
|
Kurtis Rainbolt-Greene
|
e5d9009d71
|
Using "rails style" order arguments
|
2017-01-07 17:55:40 -08:00 |
|
vjackson725
|
4f9cc841b2
|
Fix Vagrantfile to include yarn
The current Vagrantfile fails to build upon provisioning, as it lacks yarn.
Change the Vagrantfile to add the yarn repository, and install yarn.
|
2017-01-08 12:38:04 +11:00 |
|
vjackson725
|
db3d5d811c
|
Fix Vagrantfile to include yarn
The current Vagrantfile fails to build upon provisioning, as it lacks yarn.
Change the Vagrantfile to add the yarn repository, and install yarn.
|
2017-01-08 12:38:04 +11:00 |
|
Eugen
|
3f639be601
|
Merge pull request #432 from blackle/volume-icon
Show correct volume icons on video player
|
2017-01-08 02:36:12 +01:00 |
|
Eugen
|
7a0a13ab53
|
Merge pull request #432 from blackle/volume-icon
Show correct volume icons on video player
|
2017-01-08 02:36:12 +01:00 |
|
blackle
|
85cc2dd826
|
Show correct volume icons on video player
|
2017-01-07 20:23:15 -05:00 |
|
blackle
|
8a571158c9
|
Show correct volume icons on video player
|
2017-01-07 20:23:15 -05:00 |
|
Eugen
|
00c9ce1eff
|
Merge pull request #430 from blackle/logout_mobile
Show logout button on getting started so it's available on mobile
|
2017-01-08 01:24:06 +01:00 |
|
Eugen
|
cec7e69827
|
Merge pull request #430 from blackle/logout_mobile
Show logout button on getting started so it's available on mobile
|
2017-01-08 01:24:06 +01:00 |
|
blackle
|
8ceae22535
|
Show logout button on getting started so it's available on mobile
|
2017-01-07 18:41:57 -05:00 |
|
blackle
|
e1ca354956
|
Show logout button on getting started so it's available on mobile
|
2017-01-07 18:41:57 -05:00 |
|
Eugen
|
177d9cd8fe
|
Merge pull request #429 from blackle/emojify_usernames
Emojify display names in notifcations
|
2017-01-08 00:19:24 +01:00 |
|
Eugen
|
679aa35e15
|
Merge pull request #429 from blackle/emojify_usernames
Emojify display names in notifcations
|
2017-01-08 00:19:24 +01:00 |
|
blackle
|
75c2397ed1
|
Emojify display names in notifcations
|
2017-01-07 18:16:14 -05:00 |
|
blackle
|
57ff221c0f
|
Emojify display names in notifcations
|
2017-01-07 18:16:14 -05:00 |
|
Eugen
|
94d1457cd7
|
Merge pull request #428 from blackle/contrast
Improve contrast of bio and username text in account info
|
2017-01-07 22:51:15 +01:00 |
|