glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
1280 commits 40 branches 27 tags 58 MiB
Commit graph

333 commits

Author SHA1 Message Date
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
Connor Turland 0941b43391 fixed spacing on abuot lightbox 2014-09-11 08:39:56 -04:00
Shai Mor f49f45e856 about, invite, getInvolved 2014-09-10 18:12:21 -04:00
Shai Mor 23385a946e Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop 2014-09-10 16:32:36 -04:00
Shai Mor f91728cdb6 get involved lightbox styling 2014-09-10 16:32:18 -04:00
Connor Turland 28bfb8ac21 better architecture for entering and exiting maps from the home page 2014-09-10 15:06:39 -04:00
Connor Turland 3a7501cc7a merge shai's changes 2014-09-09 18:20:17 -04:00
Connor Turland d2760b8688 change in embedly 2014-09-09 18:17:39 -04:00
Shai Mor d18806bb18 merge in connors css 2014-09-09 15:17:49 -04:00
Shai Mor 4f85055c74 styled create map forms 2014-09-09 15:13:53 -04:00
Connor Turland eedd3736cf realtime and filter box styling 2014-09-03 19:05:25 -04:00
Connor Turland 1ccaccdb32 small css syntax fix 2014-08-26 23:01:08 -04:00
Connor Turland fdf0c28daf sprites 2014-08-26 22:51:50 -04:00
Connor Turland f6245df997 added 20 at a time loading for explore maps pages 2014-08-20 15:37:18 -04:00
Connor Turland 2d338bb785 fixed right click menu and also added change metacodes to it 2014-08-19 14:13:45 -04:00
Connor Turland 7df57cd013 feedback tab and explore maps pages styling 2014-08-18 12:40:51 -04:00
Connor Turland ff03fb19a1 adding a few icons 2014-08-18 11:17:01 -04:00
Connor Turland 45828d048e added some of the icons 2014-08-17 14:46:07 -04:00
Connor Turland 987f3c3ab5 added first pass ishans icons, removed old unnecessary icons 2014-08-15 18:27:40 -04:00
Connor Turland 6eca81487a started styling of map cards and topic card, removed new maps section 2014-08-15 18:04:22 -04:00
Connor Turland 46380a17e0 got maps wrapper working 2014-08-12 19:20:46 -04:00
Connor Turland 6422b54dc0 clickable map cards 2014-08-12 18:14:04 -04:00
Shai Mor 304c9f3b4b Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into shai 2014-08-12 12:56:20 -04:00
Shai Mor f8e6be70e1 fixed topic card css 2014-08-12 12:56:13 -04:00
Connor Turland e1fb72c2df fixed user model and map models up 2014-08-12 11:09:53 -04:00
Connor Turland 9d6cf2c3c8 further improved explore maps switching 2014-08-11 22:47:38 -04:00
Shai Mor 3be9dcfd74 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into shai 2014-08-11 18:59:27 -04:00
Connor Turland bbc50d1305 got radial view working 2014-08-11 18:57:34 -04:00
Shai Mor 85bfce0237 part way through add links to topic cards 2014-08-11 18:55:53 -04:00
Connor Turland f4cbd9b25d added background 2014-08-11 12:12:46 -04:00
Connor Turland 8fdae123d2 application.css issue 2014-08-10 19:17:32 -04:00
Connor Turland 341f9b9bdd home page styling 2014-08-10 19:13:25 -04:00
Connor Turland 06b35e550d first draft of explore maps working 2014-08-10 13:06:58 -04:00
Robert Best f75c2c1f8a Added Recenter map, zoom in, zoom out, Zoom to extents and buttons for each. Also, renamed selection function to just SelectWithBox() 2014-08-06 04:22:06 -04:00
Tadasu85 e76d780335 Filter box coding changes, Full implementgit add . 2014-08-04 12:20:16 -04:00
Connor Turland e08c702494 introduced the metamaps.router 2014-08-01 22:50:23 -04:00
Connor Turland 3476d0126c got rgraph working again 2014-07-30 21:10:10 -04:00
Connor Turland f817ce772c changed approach to map creation. reorganized code to suit that. 2014-07-29 23:18:43 -04:00
Connor Turland ae8c711d27 major code refactor 2014-07-29 13:34:10 -04:00
Connor Turland b06f5cae35 huge refactor 75% done 2014-07-27 15:57:35 -04:00
Connor Turland 9027cd6d2e closes #352 size of cheatsheet window, closes #351 remove topic and synapse create from cheatsheet on topic pages, closes #348 enter key creating undesirable line break 2014-06-15 14:39:42 -04:00
Connor Turland bffda35686 updated cheatsheet to be tabbed 2014-06-14 18:21:54 -04:00
Connor Turland 2bb5c7a6bd added homepage image 2014-06-11 22:38:48 -04:00
Connor Turland 0a3f83ade9 added realtime box 2014-06-11 16:47:46 -04:00
Connor Turland 5dd848abcf fixed scrolling on home page 2014-06-11 10:38:08 -04:00
Connor Turland 140a526226 changed home page card styling 2014-06-11 10:25:33 -04:00
Connor Turland 820096e853 merged raymons changes 2014-06-11 08:42:12 -04:00
Connor Turland 6cec71fe2c actually fixed metacode set styling issues 2014-06-10 20:30:06 -04:00
Connor Turland 3625a750fd fixed metacode sets page styling issue 2014-06-10 20:22:35 -04:00
Raymon Johnstone 3d8332056a Addition of scrollbar to search results. 2014-06-10 20:13:15 -04:00
Raymon Johnstone 6f2d19c570 Addition of scrollbar to search results 2014-06-10 17:41:34 -04:00
Connor Turland bfa25bc604 sped up scroll bars 2014-06-10 13:34:39 -04:00
Connor Turland b7703e2a0f improved metacode set switcher styling 2014-06-10 13:13:21 -04:00
Connor Turland 35985aecaa fixed styling of many of the user forms 2014-06-10 12:59:19 -04:00
Connor Turland 8760cf0280 added new images and made realtime send more relevant messages including one when someone turns on realtime 2014-06-09 16:37:09 -04:00
Connor Turland 31817d31a5 closes #202, closes #301, closes #320, closes #337 2014-06-09 13:36:23 -04:00
Connor Turland 2820f57a9f added metacode background bar set to match metacode color 2014-06-08 16:26:25 -04:00
Connor Turland a46d097da9 ability to switch metacode sets from mapping page 2014-06-04 15:24:16 -04:00
Connor Turland f121661858 merge changes on user settings page 2014-05-30 09:25:29 -04:00
Raymon Johnstone 5f349305a1 Walkthrough for ubuntu added, as well as our lost default database file readded 2014-05-20 20:07:22 -04:00
Raymon Johnstone 2a59d67d79 removed extra files 2014-05-17 16:10:44 -04:00
Connor Turland 48dc11b53d added ability for an admin to add metacodes and metacode sets 2014-05-17 14:57:03 -04:00
Raymon Johnstone 02b87fdafe Filters removed from settings page 2014-05-14 16:16:26 -04:00
Connor Turland 8c985add2c styled autocompletes and tooltips 2014-03-03 16:58:03 -08:00
Connor Turland 909a5307d0 social icons name change 2014-03-03 01:37:15 -08:00
Connor Turland 7f5269bb84 added the ability to change the map permission from the map info box 2014-03-02 18:53:19 -08:00
Connor Turland 5fe3eb8f00 fixed capitalization issues. tidied up topic pages. added center this topic icon 2014-03-02 16:36:18 -08:00
Connor Turland dfca29c9b3 put message above canvas 2014-03-02 15:24:13 -08:00
Connor Turland 4fc60c13e7 ability to change the permissions of multiple through the right click menu implemented 2014-03-02 15:05:03 -08:00
Connor Turland 2abeb73e9a styled synapse card 2014-03-01 19:02:27 -08:00
Connor Turland 5dd03ab4f7 cross browser flexbox support 2014-02-26 15:52:54 -08:00
Connor Turland c9aea733ad fixed explore maps floating left issue 2014-02-26 12:00:18 -08:00
Connor Turland 4362e4f126 set the background back to normal, fixed the user sign up issue 2014-02-26 11:53:20 -08:00
Connor Turland 3a88abbb1b background update test 2014-02-25 15:05:25 -08:00
Connor Turland f990ee1c8c added ability to change topic permission 2014-02-24 17:03:13 -08:00
Connor Turland 2e252c2647 fixed scrollbars further 2014-02-24 12:47:02 -08:00
Connor Turland 000089730c fixed custom scroll bars on maps pages 2014-02-24 12:29:54 -08:00
Connor Turland eb940a1f7b moved lower bars lower to bottom 2014-02-24 11:51:55 -08:00
Connor Turland 2df3bda590 added hover to homepage image 2014-02-24 11:35:48 -08:00
Connor Turland 08341e3c83 replaced background images 2014-02-23 23:22:40 -08:00
Connor Turland d093ebeeba adding tooltips, added maps topic appears on pages. 2014-02-20 17:22:13 -08:00
Connor Turland ec9fe66bfe styled notifications 2014-02-10 01:47:48 -05:00
Connor Turland 4e8fc6fe06 added tips to cards 2014-02-10 01:29:02 -05:00
Connor Turland fb4da722ab removed extra migrate files 2014-02-09 23:48:05 -05:00
Connor Turland 5181c91aa7 restyled PAQ and Request pages. 2014-02-09 23:36:23 -05:00
Connor Turland ac12c2a9ae added ability to change metacode. updated bottom left menu with icon, upper right menu with hover states 2014-02-09 18:54:45 -05:00
Connor Turland bfdf706f15 cheatsheet and menu and upper right menu 2014-02-09 10:05:32 -05:00
Connor Turland 1c49a805bd removed more old files, styled request invite page 2014-02-07 18:13:51 -05:00
Connor Turland 2045220622 styled lightboxes further, changed FAQ to PAQ 2014-02-07 17:25:02 -05:00
Connor Turland 17fe5fa241 styled faq page 2014-02-07 12:55:11 -05:00
Connor Turland ab40ddfdf4 a lot of little coloring things 2014-02-06 15:16:51 -05:00
Connor Turland 86b60048c3 styled new map forms 2014-02-06 12:40:44 -05:00
Connor Turland ae46c27bec started styling map forms 2014-02-05 12:37:21 -05:00
Connor Turland 4350c0df1b added lightboxes 2014-02-05 00:03:44 -05:00
Connor Turland 6a63b1fe47 removed assets 2014-02-04 22:03:24 -05:00
Connor Turland fdcee3ae40 synapse autocomplete working 2014-02-04 20:28:06 -05:00
Connor Turland 9a560ff829 styled carousel autocomplete results. moved tooltips. built out map info box 2014-02-03 20:43:31 -05:00
Connor Turland 4e3c9fc439 added tooltips on search results, added icon for change metacode set, did further styling of open topic card 2014-02-03 00:35:21 -05:00
Connor Turland 6538577387 added ability to limit search results to just your own, and to minimize the different sections of search results 2014-02-02 14:56:07 -05:00
Connor Turland 9c3c7c5e01 enabled filter by metacode. enabled navigation through topic pages using right click. styled topic card 2014-02-01 03:57:19 -05:00
Connor Turland 021fffe11f added right click menu icons, did text wrap on labels 2014-01-30 21:28:10 -05:00
Connor Turland 9ca9e56536 improved the labels. started the right click menu. added the wand menu. added the create map feature. replaced images with recolored ones. 2014-01-30 19:32:15 -05:00