Connor Turland
|
8d3de3867f
|
enabled pulling in siblings through right click menus in topic view
|
2014-11-11 06:48:21 -05:00 |
|
Connor Turland
|
9b0304c403
|
added filtering back to topic view
|
2014-11-11 02:23:39 -05:00 |
|
Connor Turland
|
4adf0081b8
|
Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop
|
2014-11-09 22:10:21 -05:00 |
|
Connor Turland
|
44923eb660
|
added new map screenshot capture method
|
2014-11-09 22:10:13 -05:00 |
|
poietic
|
4437270a6b
|
misc css tweaks
|
2014-11-08 21:52:46 -08:00 |
|
Connor Turland
|
0b7702062f
|
added little link icon next to metacode to indicate a link within a topic
|
2014-11-05 11:01:18 -05:00 |
|
Connor Turland
|
6a052f9ea1
|
added loading icon to account page while image uploads
|
2014-11-03 21:59:15 -05:00 |
|
Connor Turland
|
4646bf9668
|
client side image crop for profile pics
|
2014-11-03 21:26:08 -05:00 |
|
Connor Turland
|
6ecdd1076e
|
topic card description overflow improvement, handle invalid links in topic card
|
2014-11-03 17:48:02 -05:00 |
|
Connor Turland
|
ee1ca7853f
|
removed embed. fixed switch metacode set lightbox overflow. disabled topic creation and topic deletion from public maps by non-owner
|
2014-11-03 08:46:22 -05:00 |
|
Connor Turland
|
2a9a27c6c5
|
stops user from creating map with empty name, or topic with empty name. sets max length on topic name. allows enter key to create map
|
2014-11-02 16:04:53 -05:00 |
|
Connor Turland
|
12e65c638b
|
changes for reset password form
|
2014-10-27 18:24:30 -04:00 |
|
Connor Turland
|
acfd55a258
|
add authorize to delete to controller, fix private map message, fix new map css issue
|
2014-10-27 13:26:24 -04:00 |
|
Connor Turland
|
f58db49bc1
|
realtime
|
2014-10-27 12:03:55 -04:00 |
|
Connor Turland
|
cbf71ca2da
|
four little styling bugs
|
2014-10-24 12:10:56 -04:00 |
|
Connor Turland
|
1aaecd0a8f
|
improved sign up error display, fixed styling for firefox, fixed page stuck on loading spinner bug
|
2014-10-24 11:30:26 -04:00 |
|
poietic
|
3a8e0c08a6
|
changed order of "delete, remove, hide from map"
|
2014-10-22 21:06:42 -04:00 |
|
Connor Turland
|
49c0af3add
|
Merge pull request #371 from Connoropolous/wip-MouseStuff
Changes to Mouse Functionality
|
2014-10-22 11:34:51 -04:00 |
|
Connor Turland
|
a7328526a8
|
got profile picture uploading working, as well as profile picture removing, as well as password changing
|
2014-10-21 20:31:59 -04:00 |
|
Raymon Johnstone
|
6840d69747
|
lightboxes and stylesheet changes
|
2014-10-18 13:56:45 -04:00 |
|
Connor Turland
|
fbfe695998
|
adding topics to map from search results happens in a spiral
|
2014-10-16 23:54:26 -04:00 |
|
Connor Turland
|
1cceaceb06
|
cannow handle multiple metacodes with same names
|
2014-10-16 21:03:11 -04:00 |
|
Connor Turland
|
0449e28177
|
right click menus position nicely
|
2014-10-15 19:32:15 -04:00 |
|
Connor Turland
|
79daaf705b
|
made metacode selecct for topic card always accessible, for when you move the card near the right or bottom of screen
|
2014-10-15 18:25:31 -04:00 |
|
Connor Turland
|
c37c846fbd
|
ensured map info box action buttons only show at proper times. enabled deletion of maps
|
2014-10-14 23:20:40 -04:00 |
|
Connor Turland
|
bfc8c796c7
|
border radius for map card images
|
2014-10-14 17:00:17 -04:00 |
|
Connor Turland
|
f9f147304f
|
styling for map info box mostly complete
|
2014-10-14 16:34:09 -04:00 |
|
Connor Turland
|
51221ee3f7
|
improvements to map info card, as well as small changes to the permission changers in the topic and synapse cards
|
2014-10-13 19:27:30 -04:00 |
|
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 |
|
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 |
|