Connoropolous
2fdcb5dcc5
Update main_controller.rb
...
realized these lines we're duplicated
2014-02-18 16:45:11 -08:00
poietic
f7dc8cff60
Update _lightboxes.html.erb
...
evolved "about" description.
2014-02-17 16:30:40 -08:00
poietic
841879798b
Update paq.html.erb
...
added in flattr button and bitcoin address, for donations - may need a bit of formatting work..
2014-02-16 23:39:39 -08:00
poietic
1c0f2eb303
Update paq.html.erb
...
tweaks to answers
2014-02-16 23:34:01 -08:00
Connoropolous
f9166119f3
Update topics_controller.rb
2014-02-15 09:52:56 -08:00
Robert Best
350df8a410
Update main_controller.rb
...
changes comments to be same as others
2014-02-13 22:46:13 -05:00
Robert Best
2050e137bf
Update topics_controller.rb
...
We were missing the .downcase on term, so no queries with a capital ever find a match
See !connor
2014-02-13 22:32:51 -05:00
Robert Best
7c28e20b00
Update main_controller.rb
...
I commented notifications to you connor with !connor.... I havent looked at how to sort better yet, but my markups should make the pre-sort results a little better
2014-02-13 22:22:01 -05:00
Connor Turland
f26d13fb5f
fixed best_in_place issue, fixed toolbar functionality
2014-02-10 19:32:05 -05:00
Connor Turland
7b3311cb05
changed realtime folder
2014-02-10 02:03:06 -05: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
47710749a8
started styling map forms
2014-02-05 12:38:17 -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
b5b147de7e
fixed error in account menu
2014-02-04 22:08:41 -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
8749ba8bbe
removed a bunch of unnecessary js.coffee files with nothing in them
2014-02-04 14:55:26 -05:00
Connor Turland
5271c1ea3d
configuring url to connect to for realtime
2014-02-04 13:41:27 -05:00
Connor Turland
285c87ade7
configured for redistogo and uncommented realtime messages
2014-02-04 12:08:09 -05:00
Connor Turland
4b64e4bc06
fixed issue with date edited in map info box
2014-02-04 11:06:10 -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
d3500b0ce9
adjusted user model to not prevent sign ups
2014-01-31 11:58:32 -05:00
Connor Turland
7412b0a1b1
fixed one spot where it was trying to send realtime message over redis from the maps controller in save layout
2014-01-30 21:39:24 -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
Connor Turland
efcc449471
fixed issue where settings page was redirecting to nonexistent user profile page
2014-01-28 23:53:13 -05:00
Connor Turland
fbdfff6b83
temporarily commented out lines that send realtime messages via redis
2014-01-28 23:34:50 -05:00
Connor Turland
d6d428df60
perhaps fixed login error
2014-01-28 23:27:32 -05:00
Connor Turland
414e59e280
this is a lot of changes. too many to say here, oops
2014-01-28 22:46:58 -05:00
Connor Turland
e44d57a6d9
updated the home page
2013-12-01 20:47:28 -05:00
Connor Turland
adcdea5d5e
fixed selecting things on the radial view, and the weird synapse autocomplete bug
2013-11-14 12:28:31 -05:00
Connor Turland
6e433683c7
updated user sign up advice on the invite page finally
2013-09-18 20:04:58 -04:00
Connor Turland
f32378398a
removed extra files
2013-07-11 11:16:06 -04:00
Connor Turland
b218d898ea
added account creation again. fixed realtime bug, border radius on the menu, fixed menu on console
2013-07-11 11:13:27 -04:00
Connor Turland
41044140b7
added completely new logging in system
2013-07-10 14:02:38 -04:00
Connor Turland
2545126b0b
fixed up some styling. extended rgraph radius. added show/hide labels
2013-07-09 12:32:13 -04:00
Connor Turland
1e6210a117
fixed the realtime bug where things were moving around unexpectedly
2013-06-27 14:15:28 -04:00
Connor Turland
f657a61327
added all the code for realtime mapping using websockets. fixed some minor bugs like the label glitches, dragBox to deselect as well as select, shift click for synapses working again, panning won't deselect all your selected nodes and edges, nor hide the showcard, but a single click will hide the open card
2013-04-26 00:07:29 -04:00
Connor Turland
1491c20895
shift+click for box selecting topics
2013-03-29 02:38:13 -04:00
Devin Howard
c93c74094c
merge esc key handler stuff and fixing dragging topics
2013-03-28 21:10:35 -04:00
Devin Howard
5f86d879ac
allow dragging on topic view
2013-03-28 21:09:07 -04:00
Devin Howard
1f096cf5a5
esc deselects all nodes/synapses
2013-03-28 18:56:34 -04:00
Connor Turland
24269a10b9
developed an initial attempt at a box to select feature. SO NICE. you just hold down shift and mouse over the ones you want. fixed an important bug that was causing deselecting to go wacky
2013-03-22 02:37:56 -04:00
Devin Howard
600e5814f0
fix #172 , unless the problem applies to topics as well which I haven't investigated further
2013-03-21 22:18:20 -04:00
Devin Howard
45f856fc05
fix #170
2013-03-21 21:58:32 -04:00
Devin Howard
71047ecac4
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
2013-03-21 21:34:26 -04:00
Devin Howard
e5095093ec
added Keep Selected button to console, map view, topic view
2013-03-21 21:33:42 -04:00
Devin Howard
6ac05fa2c6
allow Enter to keep all selected nodes in commons
2013-03-21 21:29:09 -04:00
Connor Turland
41333c1991
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
2013-03-17 05:20:12 -04:00
Connor Turland
9187112754
fixed labels all up. made it so only one showcard exists
2013-03-17 05:18:30 -04:00
Connor Turland
1f7588f1ce
added ability to use touch to drag nodes, pan, and zoom. fixed label glitch for the most part
2013-03-17 02:29:17 -04:00
Devin Howard
f714212423
implement synapse autocomplete controller function to make the results distinct. fixes #139
2013-03-16 13:30:54 -04:00
Devin Howard
6ed19db3ec
undo the bug I introduced in the last commit; also change selectNodeOnClickHandler to selectNode to prevent a couple errors in topics/create.js.erb
2013-03-16 12:56:26 -04:00
Devin Howard
0049ae88d1
hide synapse autocomplete after synapse creation - didn't we fix this already?
2013-03-16 12:51:56 -04:00
Devin Howard
86895836a0
changed some disposeLabels to hideLabels - fix #156
2013-03-14 22:55:28 -04:00
Devin Howard
1c3aa6c973
more onCanvas/inCommons => whiteCircle/greenCircle changes in views. Also changed a thing in main/search.js.erb about the "temp" node being undefined instead of null that may fix an issue or not
2013-03-14 21:01:09 -04:00
Devin Howard
610286cee7
changed onCanvas to whiteCircle and inCommons to greenCircle in node data. Also a few other minor/helpful tweaks
2013-03-14 20:53:01 -04:00
Devin Howard
e54c4e24ed
fixed problems with multiple node selection dragging ( #79 )
2013-03-11 22:50:17 -04:00
Devin Howard
88a230dccf
Revert "Revert "Drag around all selected nodes, not just one - implements #79 ""
...
This reverts commit 0a1b5d51d8
2013-03-11 22:25:22 -04:00
Devin Howard
0a1b5d51d8
Revert "Drag around all selected nodes, not just one - implements #79 "
...
This reverts commit fa789dff2e
2013-03-11 22:24:17 -04:00
Devin Howard
fa789dff2e
Drag around all selected nodes, not just one - implements #79
2013-03-11 21:54:38 -04:00
Devin Howard
ddf449502b
fix #145 - autocomplete widget fades out on topic creation
2013-03-07 20:09:18 -05:00
Devin Howard
16d46ffd28
made permission editing card less stupid
2013-02-28 21:49:09 -05:00
Devin Howard
eaa9ba4d88
formatting in synapses_controller
2013-02-28 21:46:08 -05:00
Devin Howard
8f59fc34d1
added permission to synapse dataset in js in two spots: creating new edge, grabbing edge from commons
2013-02-28 21:45:42 -05:00
Devin Howard
02cff2e138
ok added edge permissions editing back in. still todo: make it look better, make it work for synapses brought in from the commons
2013-02-28 21:36:02 -05:00
Devin Howard
49d761c81c
comments
2013-02-28 21:00:09 -05:00
Devin Howard
e0e505de1d
ok you can now create mappings only if logged in and it's wonderful and you can double click things and closing the seek... tab destroys your search results
2013-02-28 20:56:57 -05:00
Devin Howard
0280b5bb21
don't fruitlessly create a million mappings when you double click nodes already in the canvas
2013-02-28 20:43:07 -05:00
Devin Howard
2cff8ce37e
ajax post that creates a mapping when you double click on a in commons node in the map
2013-02-28 20:42:09 -05:00
Devin Howard
564d18df4d
finished mappings#create except it doesn't authenticate...
2013-02-28 20:41:30 -05:00
Devin Howard
4e5fb95c7e
fixed a few problems with mappings_controller.rb
2013-02-28 20:16:04 -05:00
Devin Howard
a55fc2242c
added blank views files for mappings
2013-02-28 20:15:25 -05:00
Devin Howard
d325cb0088
renamed mapping_controller to mappings_controller
2013-02-28 20:08:55 -05:00
Devin Howard
6bcb575578
added supporting files to mapping controller - could be reverted with no problems probably
2013-02-28 19:57:04 -05:00
Devin Howard
101f49b9e6
added mapping_controller and routes, but only implemented create
2013-02-28 19:56:27 -05:00
Devin Howard
8a9b84c7f3
fixed save to map to filter by metacode too
2013-02-22 18:48:01 -05:00
Devin Howard
b336af1d53
added selectNode and deselectNode functions
2013-02-22 18:33:18 -05:00
Devin Howard
88522be80c
now if you double click 'inCanvas' nodes they will be added to the map. TODO they don't have a mapping yet
2013-02-22 18:27:11 -05:00
Devin Howard
d283797deb
made the metamaps model cooler
2013-02-22 18:08:03 -05:00
Devin Howard
195889e6fe
added clear canvas button back to topics view, including javascript code to back it up
2013-02-22 18:01:15 -05:00
Devin Howard
e2c28da81e
changed checkbox logic in find.js
2013-02-21 21:37:00 -05:00
Devin Howard
fcc1a6968c
lowercase in commons searching for topic names
2013-02-21 21:36:33 -05:00
Devin Howard
a248a866c1
changed some variable names and removed commented code in find.js
2013-02-21 21:10:11 -05:00
Devin Howard
28170035b0
fixed more indentation in find.js
2013-02-21 20:52:46 -05:00
Devin Howard
e670861f3e
added data-nil to showard links
2013-02-21 20:32:43 -05:00
Devin Howard
3e4368c0f4
This commit did three things:
...
1) Make Seek case insensitive for topic name search
2) Changed indentation in find.js
3) Removed some commented code in onCanvasSearch - if you want to recover it, it's in this commit
2013-02-21 19:59:59 -05:00
Connor Turland
5fd9af3dfd
fixed menu sizing bug and permissions sizing bug
2013-02-20 17:52:25 -05:00
Connor Turland
50bc2b53a9
added url for embedding maps
2013-02-19 09:44:43 -05:00
Connor Turland
1b29eb1eb3
hid clearcanvas and seek tabs on topic pages as they had broken functionality
2013-02-16 19:23:36 -05:00
Connor Turland
667d86083c
fixed autocomplete bugginess further
2013-02-16 19:08:19 -05:00
Connor Turland
210c73e81b
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
2013-02-16 19:03:48 -05:00
Connor Turland
c7f44d34a7
fixed console issue
2013-02-16 19:03:21 -05:00
Devin Howard
d289d77b5a
added seek/analyse/organize tabs to topic view. Was that a good idea? Who knows.
2013-02-16 17:52:38 -05:00
Devin Howard
f1a7e040fb
fixed & error on synapse desc display
2013-02-16 17:32:50 -05:00
Connor Turland
a1c5a82ac4
fixed autocomplete bugginess, fixed synapse half opacity bug
2013-02-15 20:00:05 -05:00
Connor Turland
759e6aa0bd
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
2013-02-15 08:51:11 -05:00
Devin Howard
1ea2317ab4
nicer formatting on savelayout in maps_controller.rb
2013-02-14 22:36:08 -05:00
Devin Howard
5e051ebff2
allow showcards to disappear when you click on the canvas. also fixed a couple other bugs related to showcards that make code a little more logical
2013-02-14 22:23:14 -05:00
Devin Howard
e762be0be3
implemented clear canvas too... sort of
2013-02-14 21:58:55 -05:00
Devin Howard
35dd8c1816
partway to save to map functionality on topic view
2013-02-14 21:29:45 -05:00
Devin Howard
dee531e3ef
hide synapse editing card on topic view too
2013-02-14 21:08:58 -05:00
Connor Turland
0bad3ec1de
production config file
2013-02-10 21:04:11 -05:00
Devin Howard
cd3f02d676
fixed save layout bug issue #90
2013-02-10 20:22:18 -05:00
Devin Howard
87d74fd3c2
ok you can edit nodes with whitespace now
2013-02-07 18:55:10 -05:00
Devin Howard
e1f454c4f4
set up data nil. still need to make sure nodes with only whitespace in their description field are editable
2013-02-07 18:51:41 -05:00
Connor Turland
9160ae305e
finished devins piece editing synapse directionality
2013-02-03 21:12:15 -05:00
Connor Turland
8167708383
added link to Click Me topic in logged out menu, and made it the place you go when you log in
2013-02-03 20:20:29 -05:00
Connor Turland
4bbb838cd4
reformatted home page, fixed text-overflow, added request invite page and a link to the blog
2013-02-03 19:13:21 -05:00
Connor Turland
5abe7ef173
fixed graphsettings file
2013-02-03 13:04:01 -05:00
Devin Howard
dfa2b2eb83
merged in changes from github and merged with synapse editng code
2013-01-30 19:51:55 -05:00
Devin Howard
9e8fdd5138
committing edit edge form without permission capabilities so it can go up now
2013-01-30 19:01:28 -05:00
Devin Howard
2a785b350a
added synapse editing css to base.css
2013-01-30 18:58:51 -05:00
Devin Howard
12d5e17e6c
hide synapse editing dialog on click in graphsettings.js
2013-01-30 18:58:27 -05:00
Devin Howard
a080fa2ec4
now the permissions is broken and it looks bad, but the directionality editing works
2013-01-27 17:58:43 -05:00
Devin Howard
25fa45356f
javascript, etc to allow editing of directionality and edge titles. This commit results in effective, but really horrid UI-wise, editing of such things.
2013-01-27 17:21:19 -05:00
Connor Turland
b358f3dc5b
fixed login bug
2013-01-26 00:46:03 -05:00
Connor Turland
68d08af9d3
db file for production
2013-01-25 22:50:23 -05:00
Connor Turland
81094a5d62
testing metacode things with staging
2013-01-25 22:31:35 -05:00
Connor Turland
f3de1944d1
testing metacode things with staging
2013-01-25 22:28:45 -05:00
Connor Turland
a0f638c10c
added ability to switch what metacodes you are mapping with
2013-01-25 20:49:40 -05:00
Connor Turland
9853f91a59
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
2013-01-25 00:48:09 -05:00
Connor Turland
9bc07b04fa
improved so many things
2013-01-25 00:47:32 -05:00
Devin Howard
0ad2392af5
Merge branch 'master' into devel
2013-01-24 19:53:07 -05:00
Devin Howard
87b2526373
removed 2 spaces from sessions_controller
2013-01-24 19:52:13 -05:00
Devin Howard
c9614e33e3
removed buggy line from users_controller preventing people from joining (?) Or just Ishan's friends?
2013-01-24 19:51:51 -05:00
Connor Turland
3433e1f05c
lowered synapse alpha
2013-01-23 23:40:06 -05:00
Connor Turland
397eddca84
removed assets for github
2013-01-23 22:48:03 -05:00
Connor Turland
43e1e12503
changed topic exploration to move into fluid space.
2013-01-23 22:05:24 -05:00
Connor Turland
1727d95c4c
re-enabled my work so far on realtime for Fabio
2013-01-23 13:55:50 -05:00
Connor Turland
02ac167444
good start on more persistent permissions throughout the platform
2013-01-23 13:43:01 -05:00
Connor Turland
a85e8fac71
added db config default file
2013-01-20 18:00:10 -05:00
Connor Turland
1633b61637
permissions not fully fully functional yet, don't push to staging. editing of maps as cards in place. raw data available as json at maps/:id/json, or topics/:id/json, or synapses/:id/json
2013-01-18 17:08:06 -05:00
Devin Howard
3deebc6c09
merged comment in home.html.erb with Twitter contact info
2013-01-15 19:32:23 -05:00
Devin Howard
626cf37917
added pointer to our Twitter on main page
2013-01-15 19:31:16 -05:00
Devin Howard
6aed92d22d
added comments, heavily interspersed with TODO's, to every view
2013-01-11 18:49:59 -05:00
