Fergal Moran
|
757dd03bcf
|
Merge branch 'release/4.1.0'
|
2016-09-19 20:51:34 +01:00 |
|
Fergal Moran
|
6a802e78ac
|
Version bump
|
2016-09-19 20:51:28 +01:00 |
|
Fergal Moran
|
e11ae90c01
|
Merge tag 'facebook_share_image' into develop
fix fb share
|
2016-09-19 20:50:55 +01:00 |
|
Fergal Moran
|
5e65d77db2
|
Merge branch 'hotfix/facebook_share_image'
|
2016-09-19 20:50:45 +01:00 |
|
Fergal Moran
|
f9aa4f8526
|
Changed social._getLink to ignore if http
|
2016-09-19 20:50:25 +01:00 |
|
Fergal Moran
|
3431a7c924
|
btsync permissions fuck up
|
2016-09-16 22:05:45 +01:00 |
|
Fergal Moran
|
eedaf24184
|
Merge branch 'master' of github.com:fergalmoran/dss.web
|
2016-07-08 20:50:11 +01:00 |
|
Fergal Moran
|
84c1ed8c02
|
Added sm to bower
|
2016-07-08 20:50:08 +01:00 |
|
Fergal Moran
|
6cfd2ab942
|
Grunt fixes
|
2016-07-06 23:52:30 +01:00 |
|
Fergal Moran
|
374550b2db
|
Merge branch 'develop'
|
2016-07-06 22:41:03 +01:00 |
|
Fergal Moran
|
6fd01702b9
|
Done!
|
2016-07-06 22:40:46 +01:00 |
|
Fergal Moran
|
8a13f1d447
|
Fixed user infinite scroll
|
2016-06-30 23:09:04 +01:00 |
|
Fergal Moran
|
1f089b77f9
|
User initial filtering
|
2016-06-30 21:54:16 +01:00 |
|
Fergal Moran
|
14d0ba06e5
|
Added padding to mix button bar
|
2016-06-29 19:26:06 +01:00 |
|
Fergal Moran
|
cc39b89d56
|
Sized delete comment dialog
|
2016-06-29 18:48:44 +01:00 |
|
Fergal Moran
|
ab2420f616
|
Hide search in mobile
|
2016-06-28 23:16:11 +01:00 |
|
Fergal Moran
|
11703d757b
|
Merge tag '4.0.3' into develop
4.0.3
|
2016-06-28 23:05:14 +01:00 |
|
Fergal Moran
|
285eda7ba9
|
Merge branch 'release/4.0.3'
|
2016-06-28 23:05:03 +01:00 |
|
Fergal Moran
|
907fbcb6d6
|
Version bump
|
2016-06-28 23:04:53 +01:00 |
|
Fergal Moran
|
d078d8c748
|
Fixed up mix page
|
2016-06-28 23:04:15 +01:00 |
|
Fergal Moran
|
383ab2cf5f
|
Fixed search icon url
|
2016-06-28 21:21:57 +01:00 |
|
Fergal Moran
|
9d27e56bed
|
Finished
|
2016-06-28 21:06:53 +01:00 |
|
Fergal Moran
|
79049e6569
|
Fixed user list
|
2016-06-27 20:51:43 +01:00 |
|
Fergal Moran
|
4cf90b44ba
|
Removed hamburger
|
2016-06-24 23:29:16 +01:00 |
|
Fergal Moran
|
3555caaee1
|
Some flat fixed to user profile
|
2016-06-24 23:20:38 +01:00 |
|
Fergal Moran
|
2975ee44c9
|
Fixed some padding
|
2016-06-23 23:11:38 +01:00 |
|
Fergal Moran
|
fad72931e0
|
Hiding genres (for now)
|
2016-06-23 22:13:47 +01:00 |
|
Fergal Moran
|
45b4d94c14
|
Merge conflicts
|
2016-06-23 22:06:56 +01:00 |
|
Fergal Moran
|
ec28c3636a
|
Fixed hides
|
2016-06-23 22:05:59 +01:00 |
|
Fergal Moran
|
068adfb7ac
|
Mobile layout fixes
|
2016-06-23 21:57:05 +01:00 |
|
Fergal Moran
|
74e5770f68
|
Merged hotfix/hide_upload_mobile into develop
|
2016-06-23 21:56:41 +01:00 |
|
Fergal Moran
|
d27cfb6fc8
|
merge tag '4.0.2' into develop
Finished release
|
2016-06-23 20:59:17 +01:00 |
|
Fergal Moran
|
3d7fd978d3
|
Merge branch 'release/4.0.2'
|
2016-06-23 20:59:07 +01:00 |
|
Fergal Moran
|
f2eab0b6ee
|
Version bump
|
2016-06-23 20:59:03 +01:00 |
|
Fergal Moran
|
3e03650a30
|
Merge branch 'feature/mix_stacking' into develop
|
2016-06-23 20:58:04 +01:00 |
|
Fergal Moran
|
2da45dedad
|
Stacked mixes
|
2016-06-23 20:58:02 +01:00 |
|
Fergal Moran
|
6245e666dd
|
Merge branch 'master' into feature/mix_stacking
|
2016-06-23 20:56:19 +01:00 |
|
Fergal Moran
|
9c3e7189ec
|
Merge branch 'master' into develop
|
2016-06-23 20:56:07 +01:00 |
|
Fergal Moran
|
c29665f449
|
Upload button bar
|
2016-06-23 20:23:26 +01:00 |
|
Fergal Moran
|
180839f5ce
|
Navbar fix
|
2016-06-23 20:09:31 +01:00 |
|
Fergal Moran
|
9a12ab3ebc
|
pulsate update
|
2016-06-22 22:56:42 +01:00 |
|
Fergal Moran
|
df3961c9ca
|
asdsadsa
|
2016-06-22 22:56:14 +01:00 |
|
Fergal Moran
|
494c28b54c
|
Added id to upload button
|
2016-06-22 22:28:13 +01:00 |
|
Fergal Moran
|
cc3cca424b
|
FUCKING NAVBAR
|
2016-06-22 21:35:02 +01:00 |
|
Fergal Moran
|
b38c9d495d
|
Debug live navbar test
|
2016-06-22 21:26:00 +01:00 |
|
Fergal Moran
|
35fa5c5d76
|
Merge tag 'upload_layout' into develop
Finished
|
2016-06-22 20:32:48 +01:00 |
|
Fergal Moran
|
11012a29a7
|
Merge branch 'hotfix/upload_layout'
|
2016-06-22 20:32:40 +01:00 |
|
Fergal Moran
|
3e107fb217
|
Fixed upload flow
|
2016-06-22 20:32:38 +01:00 |
|
Fergal Moran
|
89ecb181f8
|
Pre-merge
|
2016-06-22 18:34:38 +01:00 |
|
Fergal Moran
|
29d54ee979
|
Added safe apply
|
2016-06-21 22:25:08 +01:00 |
|