fergalmoran/dss.web
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.web.git synced 2026-02-15 12:34:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
114 Commits 2 Branches 0 Tags
cc3cca424b0cbeb482b7bd30ca1538ff550f1f8c
Commit Graph

114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Fergal Moran
7b3226cbd6 f 2016-06-21 22:12:38 +01:00
Fergal Moran
99978210dc Gritter images 2016-06-21 22:06:55 +01:00
Fergal Moran
4dfbfee265 g 2016-06-21 22:06:10 +01:00
Fergal Moran
448839fa64 Removed long gritter time 2016-06-21 21:46:07 +01:00
Fergal Moran
7602031a2e Local gritter (for image urls) 2016-06-21 21:38:49 +01:00
Fergal Moran
ce7c5a0fab Added gritter images to assets (hacky) 2016-06-21 21:18:29 +01:00
Fergal Moran
8e66601ead Build fixes 2016-06-21 20:35:55 +01:00
Fergal Moran
c043b7e19d Live env fixes 2016-06-21 20:33:56 +01:00
Fergal Moran
8bc258f917 LF 2016-06-21 10:18:40 +01:00
Fergal Moran
84cdd04900 Merge branch 'develop' 2016-06-20 21:59:20 +01:00
Fergal Moran
86429b6621 Rich toast sorted 2016-06-20 21:59:08 +01:00
Fergal Moran
9ea24f6986 Fixed notifications dropdown 2016-06-20 20:26:07 +01:00
Fergal Moran
9fa849dd6c Template sorted 2016-06-20 20:05:38 +01:00
Fergal Moran
66d7c00332 Sockets working 2016-06-14 21:55:56 +01:00
Fergal Moran
6faf75d264 Added docker build file 2016-06-09 19:59:27 +01:00
Fergal Moran
92d651c631 Added docker build file 2016-06-09 19:59:10 +01:00
Fergal Moran
d940575fbe Merge tag '3.5.1' into develop 
3.5.1
 2016-06-08 23:16:44 +01:00
Fergal Moran
864f4479db Merge branch 'release/3.5.1' 2016-06-08 23:16:28 +01:00
Fergal Moran
c80f54b510 Version bump 2016-06-08 23:16:18 +01:00
Fergal Moran
94f886d1c6 Fixed stuff 2016-06-08 23:15:06 +01:00
Fergal Moran
0eaa358714 Merge branch 'socket_fixes' 2016-06-03 20:52:26 +01:00
Fergal Moran
c7eecf6e4a Waveform signalling fixes 2016-06-03 20:51:56 +01:00
Fergal Moran
47f703c477 Facebook share template 2016-05-24 20:27:31 +01:00
Fergal Moran
89b6cae9b8 Fixed og:url in mix template 2016-02-09 21:11:31 +00:00
Fergal Moran
3e9da44417 Fake 2016-02-09 18:57:42 +00:00
Fergal Moran
1a47eaadb5 Fixed angular version in bower 2016-02-08 23:19:58 +00:00
Fergal Moran
3feada6a0d Routes stuff for FB 2016-02-08 23:00:07 +00:00
Fergal Moran
6067882f0d Merge tag '3.4.2' into develop 
3.4.2
 2016-02-08 20:33:31 +00:00
Fergal Moran
045ca5d80a Merge branch 'release/3.4.2' 2016-02-08 20:33:24 +00:00
Fergal Moran
b0080855ef Release start 2016-02-08 20:32:38 +00:00
Fergal Moran
1a5a4794e1 Added logging to FB redirect 2016-02-08 20:32:09 +00:00
Fergal Moran
318eb9462e Fixed origin URL in twitter login 2016-02-05 22:50:15 +00:00
Fergal Moran
9f7eb3b3eb Removed some crud and fixed logout 2016-02-04 20:17:09 +00:00
Fergal Moran
b2d7f27910 Merge tag 'fb_https' into develop 
Fixed https in node server
 2016-02-03 21:13:37 +00:00
Fergal Moran
9179e31bc7 Merge branch 'hotfix/fb_https' 2016-02-03 21:13:25 +00:00
Fergal Moran
f1df5f1fcd Auto detect https in node server 2016-02-03 21:13:23 +00:00
Fergal Moran
9213574b91 Fixed api URL 2016-02-03 20:38:16 +00:00
Fergal Moran
8bcf21563f Fixed google redirect 2016-01-30 15:09:36 +00:00
Fergal Moran
dbe8739718 Infinite Scroll version 2016-01-27 00:09:36 +00:00
Fergal Moran
32de554824 Merge conflicts 2016-01-26 22:18:00 +00:00
Fergal Moran
3a895df75c Version bump 2016-01-26 22:07:56 +00:00
Fergal Moran
78ff35990f Merge conflicts 2016-01-26 22:07:10 +00:00
Fergal Moran
6b4bb7b601 Feature finished 2016-01-26 22:02:48 +00:00
Fergal Moran
0ab088f80a Getting nowhere 2016-01-17 21:13:23 +00:00