Commit graph

234 commits

Author SHA1 Message Date
Connor Turland e17cfb4f12 border radius for map created prompt 2014-10-11 23:08:31 -04:00
Connor Turland cd4474a0f0 created map prompt 2014-10-11 22:49:44 -04:00
Connor Turland 6eec187eee Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-10-07 15:19:30 -04:00
Connor Turland b5068b6bc4 finalized uservoice config 2014-10-07 15:19:10 -04:00
Bashar Jabbour e3c677fa5b Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-10-07 14:47:18 -04:00
Bashar Jabbour e405cc5a5d updated the noIE lightbox 2014-10-07 14:47:06 -04:00
Raymon Johnstone fbdef0108e Merge commit 'stash' into develop 2014-10-07 12:39:43 -04:00
Raymon Johnstone 3cb5c4ce3a index on develop: d30417f fixed right click on topic menu, fixed synapse color when opening for synapse card, removed mCustomScrollbar 2014-10-07 12:39:14 -04:00
Connor Turland f591baf4c9 ability to switch between multiple synapses between two topics 2014-10-05 18:39:07 -04:00
Connor Turland 5c05c6bb83 404 page updates, synapse card 90% 2014-10-05 13:58:05 -04:00
Connor Turland fae7f9996d Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-10-03 11:26:49 -04:00
Bashar Jabbour cad8af2c1f updated the cheatsheet 2014-10-02 22:33:28 -04:00
Connor Turland 10e5228488 finalized cheatsheet move help button back into the corner 2014-10-01 23:41:39 -04:00
Bashar Jabbour b70681ea6e updated the 404 page 2014-10-01 23:21:05 -04:00
Bashar Jabbour 179cee8456 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-10-01 20:43:23 -04:00
Bashar Jabbour 8caabb6ce1 update the colophone page 2014-10-01 20:43:11 -04:00
Shai Mor ff4a64665e Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop 2014-10-01 18:09:15 -04:00
Shai Mor 4ba9a26c2b style sidebar search mapper stats 2014-10-01 18:07:05 -04:00
Connor Turland b577f4fd19 improved z-indexes 2014-10-01 17:15:35 -04:00
Connor Turland 8ef56735bf switch metacode set styling complete 2014-10-01 16:23:59 -04:00
Connor Turland a382e0c35d account page image border radius, fixed filters not working on first click issue 2014-10-01 14:07:48 -04:00
Connor Turland 031f97ba42 search results styling 2014-10-01 13:18:24 -04:00
Shai Mor db719abf0f merge with develop 2014-10-01 09:57:40 -04:00
Shai Mor 57fb6a15c4 start on search results styling, pulled in external js libraries and css 2014-10-01 09:54:56 -04:00
Connor Turland c1885615cd remove tilda file 2014-09-29 22:26:50 -04:00
Connor Turland 2138aa89f3 closes #368. ability to add in metacode colors 2014-09-29 22:26:12 -04:00
Connor Turland 06f18215dd bug fixes for mapping experience. able to store multiple references to synapses on each edge 2014-09-29 16:04:36 -04:00
Connor Turland 32908c7717 style changes for account pages 2014-09-26 22:31:06 -04:00
BasharJabbour 14eb7562b1 fixed edit user account page 2014-09-26 08:42:11 -04:00
Connor Turland c46ab1a98b added hover to edit photo 2014-09-25 13:41:37 -04:00
Connor Turland 71247a8f04 fixes for account pages 2014-09-25 13:26:09 -04:00
Connor Turland 3f901074ec Merge branch 'forgetpass' of https://github.com/Connoropolous/metamaps_gen002 into accounts 2014-09-25 12:31:29 -04:00
BasharJabbour 6f62d59b66 Sign In, Sign Up, Edit User pages have been changed. Edit User page needs lots of work still. 2014-09-25 12:25:46 -04:00
Shai Mor 4ec9c4cb98 add zoom and pas events for multiple peers and label direction for compassCollab 2014-09-24 16:25:22 -04:00
Shai Mor d5598819fd add arrowCompass for collab: direction indication of other users on the map 2014-09-24 11:00:22 -04:00
Connor Turland b163442163 collab compass nowrap 2014-09-24 08:45:46 -04:00
Connor Turland c2340301fd Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-09-22 23:42:37 -04:00
Connor Turland aaf2e4c521 right click styling 2014-09-22 23:42:26 -04:00
Shai Mor 1396b02952 collabCompass img&p for content and styling 2014-09-22 11:44:09 -04:00
Shai Mor d115861584 collabCompass img and p for content and styling 2014-09-22 11:36:53 -04:00
Bashar 5e76b44b80 centered reset password box 2014-09-21 20:47:09 -04:00
Connor Turland ff6eef7807 synapse form styling and positioning 2014-09-21 01:02:21 -04:00
Connor Turland 90e974164d added more resources into help lightbox 2014-09-20 15:11:58 -04:00
Connor Turland ac867d00ab m 2014-09-18 02:39:00 -04:00
Connor Turland 683b459eeb Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-09-18 02:33:44 -04:00
Connor Turland af5560b495 updates to metacode select within topic card 2014-09-18 02:33:38 -04:00
Shai Mor 0bf28410e6 switch metaset view changes 2014-09-17 10:59:36 -04:00
Connor Turland b6893d8f92 fixed admin panels 2014-09-15 21:57:34 -04:00
Connor Turland 6fe8cf4b88 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-09-12 15:07:52 -04:00
Shai Mor b722dc911b help qr tutorials 2014-09-12 11:45:53 -04:00