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

367 commits

This branch
This branch
All branches
Author SHA1 Message Date
Connor Turland
a97caa5c7a updated gem file to use older version of jquery rails that is working locally 2013-02-03 20:06:19 -05:00
Connor Turland
31dc1ed126 removed assets 2013-02-03 19:52:39 -05:00
Connor Turland
f402ddc243 changed code for production env so that I can debug 2013-02-03 19:52:14 -05:00
Connor Turland
24dcd4c13a added code to application.rb that should fix 2013-02-03 19:25:08 -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
da1ce2bc87 removed public/assets 2013-01-30 19:49:47 -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
7f6eb94e7a assets for staging 2013-01-25 22:07:02 -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
633e882aaa added assets for stagin 2013-01-25 00:56:31 -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
57219f0d1e assets for stagin 2013-01-23 22:56:52 -05:00
Connor Turland
397eddca84 removed assets for github 2013-01-23 22:48:03 -05:00
Connor Turland
2a50e58820 added assets for staging 2013-01-23 22:12:17 -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
Devin Howard
aa911d4bdf Merge branch 'master' of https://github.com/Connoropolous/metamaps_gen002 2013-01-20 21:22:33 -05:00
Devin Howard
1645e8a772 added brief readme 2013-01-20 21:09:38 -05:00
Connor Turland
7227e29aef added db config default file 2013-01-20 18:00:27 -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
Connor Turland
e6029e59c8 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-01-15 19:34:40 -05:00
Devin Howard
3deebc6c09 merged comment in home.html.erb with Twitter contact info 2013-01-15 19:32:23 -05:00
Connor Turland
fdd43634e2 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-01-15 19:32:22 -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
Connor Turland
a41a352a8c added files for production 2013-01-11 01:54:20 -05:00
Devin Howard
c26b45230f Merge branch 'devel' 2013-01-10 22:20:46 -05:00
Devin Howard
d3358d17d0 OK those bugs are fixed. The great Javascript refactor is done for tonight. 
graphsettings.js has been split into the following files (shown with line counts):

:javascripts Devin$ wc -l Jit/graphsettings.js
     384 Jit/graphsettings.js
:javascripts Devin$ wc -l Jit/onCreateLabelHandler.js
     281 Jit/onCreateLabelHandler.js
:javascripts Devin$ wc -l Jit/select-edit-delete-nodes-and-edges.js
     185 Jit/select-edit-delete-nodes-and-edges.js
:javascripts Devin$ wc -l Jit/graphsettings-model.js
      12 Jit/graphsettings-model.js
:javascripts Devin$ wc -l Jit/graphsettings-event-handlers.js
     145 Jit/graphsettings-event-handlers.js
 2013-01-10 22:19:44 -05:00
Devin Howard
bb1bf2d05f removed alerts from loadgraphs.js 2013-01-10 22:02:34 -05:00
Devin Howard
d69cafaf85 a bunch of javascript refactoring, but this specific commit introduces at least one bug (onCreateLabel isn't called) 2013-01-10 22:01:24 -05:00
Devin Howard
c372f3dfc6 updated Gemfile to 3.2.11 2013-01-10 21:22:01 -05:00
Devin Howard
d2383e50db make description field not have save/cancel buttons for best_in_place 2013-01-10 19:13:18 -05:00
Connor Turland
3c6baae698 push to live successful! swapping back out files for normal dev 2013-01-08 00:42:00 -05:00