Connor Turland
|
70cf1426d7
|
fixed merges from develop
|
2014-11-11 07:05:31 -05:00 |
|
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
|
54584fb064
|
Merge branch 'develop' into tvw
|
2014-10-27 18:24:50 -04:00 |
|
Connor Turland
|
12e65c638b
|
changes for reset password form
|
2014-10-27 18:24:30 -04:00 |
|
Connor Turland
|
96ed2bcd64
|
Merge branch 'develop' into tvw
|
2014-10-27 13:26:42 -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
|
8e55d32146
|
Merge branch 'develop' into tvw
|
2014-10-24 12:11:24 -04:00 |
|
Connor Turland
|
cbf71ca2da
|
four little styling bugs
|
2014-10-24 12:10:56 -04:00 |
|
Connor Turland
|
75c286ecc6
|
merged develop fixes
|
2014-10-24 11:31:39 -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 |
|
Connor Turland
|
a8fb22ee95
|
fix for allowing sign ups, and for about lightbox overflow
|
2014-10-23 20:31:57 -04:00 |
|
Connor Turland
|
2d0793c083
|
fixed broken lightbox content
|
2014-10-23 20:16:04 -04:00 |
|
Connor Turland
|
189f04780c
|
rejig urls, switch support image, add default map image
|
2014-10-23 19:54:39 -04:00 |
|
Connor Turland
|
e61a32ebaa
|
removed typekit for mooo.com, fixed topright_sprite
|
2014-10-22 21:26:37 -04:00 |
|
poietic
|
3a8e0c08a6
|
changed order of "delete, remove, hide from map"
|
2014-10-22 21:06:42 -04:00 |
|
Connor Turland
|
3d973dc7f3
|
styled homepage, made sure password forgot, and password reset pages were accessible when logged out, updated metacode images
|
2014-10-22 13:41:06 -04:00 |
|
Connor Turland
|
13937ae51d
|
merged conflicts coming from develop branch
|
2014-10-22 11:52:31 -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 |
|
Connor Turland
|
37455abfe9
|
removed lightboxes, password protected
|
2014-10-18 19:26:34 -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 |
|