mirrors/notebook
3
0
Fork 0
mirror of https://github.com/indentlabs/notebook.git synced 2025-10-26 11:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,396 Commits 83 Branches 44 Tags 172 MiB
6e2c96bc2a
Commit Graph

1118 Commits

Author SHA1 Message Date
Andrew Brown
417213b130 Allow filtering content by universe 2016-08-10 22:59:51 -05:00
Andrew Brown
5a9841c6b4 Ensure content privacy 2016-08-10 20:56:35 -05:00
Andrew Brown
715a269429 Don't throw 500 on dashboard if we can't ask question about contnet 2016-08-06 02:57:09 -05:00
Andrew Brown
bfef0ca8f2 Ask users about content on their dashboard 2016-08-06 02:53:37 -05:00
Andrew Brown
e571b2e50f Don't throw a 500 if we can't generate a question about content, just don't ask the question 2016-08-06 02:15:54 -05:00
Andrew Brown
76be39d214 Allow specifying children of a character 2016-08-06 01:36:24 -05:00
Andrew Brown
eda6e72db6 Hook up serendipitous form for simple fields 2016-08-04 20:50:40 -05:00
Andrew Brown
b7771f4a27 Merge branch 'master' of https://github.com/indentlabs/Indent 2016-07-31 02:00:39 -05:00
Andrew Brown
dbe6118efe Lean entity extraction + contextual card popups in editor 2016-07-31 01:36:54 -05:00
Andrew Brown
28cd4c4739 add proof of concept editor 2016-07-31 00:20:28 -05:00
Robert Richter
8997c51467 Fixed up Characters Controller tests 2016-07-08 21:50:02 -05:00
Andrew Brown
c809b3ed9c Character birthplace / tweaking for Character-->Location relations 2016-05-03 15:46:58 -05:00
Andrew Brown
829d7709ab Self referential assoc cleanup 2016-05-03 15:06:02 -05:00
Andrew Brown
5062a41f89 All self-referential relations for Characters 2016-05-03 14:48:01 -05:00
Andrew Brown
ffdb9c7b26 Character#mothers is now a relation 2016-05-03 13:45:14 -05:00
Andrew Brown
bd6a2236db Characters#fathers is now a relation 2016-05-03 13:34:05 -05:00
Andrew Brown
4300bf492a Edit siblingships/relations from #_form 2016-05-02 19:37:37 -05:00
Andrew Brown
2819f062e3 Use chips in content#show relations 2016-05-02 11:31:47 -05:00
Andrew Brown
344ac20fb7 Relation autocomplete tweaking 2016-04-30 15:14:08 -05:00
Andrew Brown
22b2d2bf66 More routes/code cleanup 2016-04-30 14:41:12 -05:00
Andrew Brown
80e0a7228f Relation autocomplete plumbing 2016-04-30 13:06:22 -05:00
Andrew Brown
c611022f1d Recognize associations on content#edit 2016-04-30 12:21:32 -05:00
Andrew Brown
1d12e96506 Siblingship join model 2016-04-29 14:01:35 -05:00
Andrew Brown
395fc83b89 Remove siblings from Character 2016-04-29 13:58:53 -05:00
Andrew Brown
9719fdbeed cleanup 2016-04-27 16:22:12 -05:00
Andrew Brown
6cfd0e06af Show serendipitous card base 2016-04-25 22:04:00 -05:00
Andrew Brown
afcb02036e clean up redundancy 2016-04-07 02:30:38 -05:00
Andrew Brown
467cf6e33d Abstract new/edit forms to content model 2016-04-06 23:30:14 -05:00
Andrew Brown
e55287c8d4 character show page 2016-04-06 22:30:18 -05:00
Andrew Brown
029032900a restyle dashboard 2016-04-06 18:45:14 -05:00
Andrew Brown
d2209b2374 Rename equipment to items, hook up nav links 2016-04-06 17:46:18 -05:00
Andrew Brown
d1295ef243 ponr: replace custom login with devise login 2016-04-06 15:04:06 -05:00
Andrew Brown
70a1bba5dc Clean up ContentController complexity 2015-09-01 23:42:54 -05:00
Andrew Brown
9f1fada4c2 Remove dead code 2015-09-01 23:20:56 -05:00
Andrew Brown
317f0e8f7d Universe abstraction 2015-09-01 23:15:16 -05:00
Andrew Brown
2db13f92f1 Locations abstraction 2015-09-01 23:07:53 -05:00
Andrew Brown
3a98e48bf5 Language abstraction 2015-09-01 22:59:07 -05:00
Andrew Brown
95eb44616d Equipment abstraction 2015-09-01 22:53:50 -05:00
Andrew Brown
1172be4c9d Characters abstraction 2015-09-01 22:49:59 -05:00
Andrew Brown
4c45f89501 Fix magic tests with new content stuff 2015-09-01 22:39:39 -05:00
Andrew Brown
d6d10a30cc Abstract core content functionality from magic controller to content controller 2015-09-01 22:08:34 -05:00
Andrew Brown
7b10a746c8 ContentController parent class for content 2015-09-01 20:28:24 -05:00
Andrew Brown
8f88d28c0e Rubocopification 2015-09-01 20:27:07 -05:00
Andrew Brown
d16464320e Slurp privacy into ownership concern 2015-08-28 00:21:04 -05:00
Andrew Brown
c07c178a42 HasOwnership concern 2015-08-28 00:06:09 -05:00
Andrew Brown
5330551899 A couple minor bugs 2015-08-27 23:54:03 -05:00
Andrew Brown
fee8cfa7e0 Hit ownership with a dose of metaprogramming 2015-08-27 23:46:59 -05:00
Andrew Brown
f2df776684 Clean up picker selector 2015-08-27 23:12:21 -05:00
Andrew Brown
5248c0b802 Revert "Internationalize strings" 2015-04-28 23:04:18 -05:00
Robert Richter
bc41bc0e4b Style fixes 2015-04-25 14:06:56 -05:00
Robert Richter
37d39e6e97 Add locale validation 2015-04-25 13:12:23 -05:00
Robert Richter
2e97ab48a7 Remove duplicated l10n functions 2015-04-23 21:21:28 -05:00
Robert Richter
a831f88816 Merge branch 'start-i18n' of https://github.com/Cantido/Indent into start-i18n 2015-04-23 18:17:05 -05:00
Robert Richter
92df67eb03 Create a concern to set current locale 2015-04-23 18:16:32 -05:00
Robert Richter
6e5f778cb6 Set locale for each request 
Can be set by either the HTTP_ACCEPT_HEADER, or through
passing a "locale=??" parameter in the URL.
 2015-04-23 18:16:30 -05:00
Robert Richter
7403a820eb Set locale for each request 
Can be set by either the HTTP_ACCEPT_HEADER, or through
passing a "locale=??" parameter in the URL.
 2015-04-22 23:04:58 -05:00
Robert Richter
860f5d48c8 Fix function that creates 10 anonymous users every call 2015-04-20 19:16:20 -05:00
Robert Richter
3df0ff50e1 Migrate to built-in ActiveModel secure passwords 2015-04-19 19:29:42 -05:00
Robert Richter
6d05bc769e Fix a string containing escape characters 2015-04-18 22:57:11 -05:00
Robert Richter
cbe0dbda1d Create tests for the locations generator 2015-04-01 16:57:58 -05:00
Robert Richter
1c87087861 Add missing equals sign 2015-03-29 20:17:34 -05:00
Robert Richter
8266acdd56 I did translation parameters wrong 2015-03-29 16:52:08 -05:00
Robert Richter
9206f97c51 Clean style of SessionsController 2015-03-29 16:25:57 -05:00
Robert Richter
86f1a29b7f Clean style of MagicController 2015-03-29 16:24:55 -05:00
Robert Richter
ced01ecd28 Clean style of LocationsController 2015-03-29 16:23:01 -05:00
Robert Richter
7c817c9984 Clean style of LanguagesController 2015-03-29 16:22:08 -05:00
Robert Richter
5bf4e4fcf5 Loosen RuboCop restrictions to fit respon_to block 2015-03-29 16:19:28 -05:00
Robert Richter
9ce65f6f48 Add Login method required by users_controller 2015-03-29 16:18:13 -05:00
Robert Richter
bcdd4721c7 Clean style of UsersController 2015-03-29 16:16:58 -05:00
Robert Richter
b484e04b49 Clean style of UniversesController 2015-03-29 16:05:27 -05:00
Robert Richter
0565266a20 Clean style of ApplicationHelper 2015-03-28 21:45:05 -05:00
Robert Richter
9a0475c516 Refactor to access data via User object 2015-03-28 12:22:47 -05:00
Robert Richter
5b623ce7e9 Clean style of MainController 2015-03-28 12:18:33 -05:00
Robert Richter
e7340ea2c8 Consolidate model update and creation translations 2015-03-28 11:09:42 -05:00
Robert Richter
0f8fbc70a2 Fix two minor offenses in the CharactersGenerator 2015-03-27 23:47:41 -05:00
Robert Richter
c032b57318 Refactor GeneratorController 
Split it up into three generator controllers.

Also i18n'd all strings
 2015-03-27 22:56:45 -05:00
Robert Richter
a6728af397 Clean style in the EquipmentController 2015-03-27 18:20:29 -05:00
Robert Richter
70de798c77 Use ActiveRecord ordering instead of array.sort 2015-03-26 18:24:05 -05:00
Robert Richter
a7ba0ff9d6 Remember that Ruby is not Java 2015-03-26 18:19:16 -05:00
Robert Richter
00e793bf1e Refactor style using the Rubocop auto-correct 2015-03-25 22:42:45 -05:00
Robert Richter
dfd80d9539 Refactor CharactersController for style 2015-03-25 22:38:18 -05:00
Robert Richter
1e06763f98 Refactor ApplicationController for style 
Strings were internationalized, methods extracted, partials written.
 2015-03-24 20:25:57 -05:00
Robert Richter
532e2ef0a6 Extract username/password digest function 2015-03-22 12:20:16 -05:00
Andrew Brown
6602d8bb26 Log out users with the old style of cookies 2015-03-16 02:53:41 -05:00
Andrew Brown
cea24d8416 Hopefully fix migration json parse 500 2015-03-16 02:40:31 -05:00
Andrew Brown
c2497d5123 Fix non-anon users sometimes seeing anon banner #366 2015-03-14 01:31:47 -05:00
Andrew Brown
50944c3727 Fix some tests 2015-03-14 01:29:17 -05:00
Andrew Brown
3fd6d604fe Revert "Revert "Resolve merge with master"" 
This reverts commit 6f8ae925ba.

Conflicts:
	app/assets/stylesheets/bootplus_overrides.css.less
 2015-03-13 22:46:31 -05:00
Robert Richter
6f8ae925ba Revert "Resolve merge with master" 
This reverts commit 8524963f1c12d6f4667964acc16680749dec20cf, reversing
changes made to bdb208e18769be9ea95c06d54c72f86d2d6a0209.
 2015-03-13 20:18:49 -05:00
Robert Richter
1cab3282ff Add all the remaining tests and code to get the site functional 2015-03-13 20:15:54 -05:00
Robert Richter
b91b53412e Created Languages controller tests, and updated Languages controller to use Rails 4 strong parameters 2015-03-13 20:14:47 -05:00
Robert Richter
e661f692a9 Create equipment controller tests and update Equipment controller to use Rails 4 strong parameters 2015-03-13 20:14:46 -05:00
Robert Richter
ccad5e6d1f Fix Character model and tests 2015-03-13 20:14:06 -05:00
Robert Richter
d0192b47a6 Create Character tests 2015-03-13 20:14:06 -05:00
Andrew Brown
06c6b0ce89 Merge resolution 2015-03-13 20:12:42 -05:00
Andrew Brown
8dca1c72af Use location paths on location#edit, not character paths 2014-10-23 03:33:04 +00:00
Andrew Brown
1140037f3d Do not double-hash user passwords #378 2014-08-03 19:44:31 -05:00
Andrew Brown
693edc0790 Reset anon user flag on successful logins #366 2014-08-03 03:58:22 +00:00
Andrew Brown
bc9746bdc8 add my_content helper for getting content owned by currently-logged-in user 2014-03-14 20:47:29 +00:00
Andrew Brown
963567ec77 move pickers to their own helper and dear god remove a little of that duplicated code 2014-03-14 20:39:58 +00:00
Andrew Brown
e0a1bf4fe6 tie magic to universe + show it on universe#show 2014-01-09 14:57:03 +00:00
Andrew Brown
632a8ded0b location pairing with universe + showing on universe#show 2014-01-09 14:48:10 +00:00
Andrew Brown
02556afe32 allow languages to be tied to a universe 2014-01-09 14:25:21 +00:00
Andrew Brown
6f67d6488c fix privacy restrictions 2014-01-09 14:17:44 +00:00
Andrew Brown
cde90ead99 let equipment be tied to a universe 2014-01-09 14:01:36 +00:00
Andrew Brown
34e08d3705 show character list on universe page of chars in that universe 2014-01-09 13:51:02 +00:00
Andrew Brown
70c7cb1439 hide private content, allow #show on public content 2014-01-09 03:04:11 +00:00
Andrew Brown
609f19bb6f catch heroku resetting connection on long uploads and continue without the upload 2014-01-08 21:21:41 +00:00
Andrew Brown
3b30afc154 don't create anon accounts until content is actually created 2013-12-09 14:38:29 -06:00
Andrew Brown
f0f6062f25 do away with forced-accounts and create them on the fly when users make stuff 2013-12-08 21:43:23 -06:00
Andrew Brown
5c6ac87cbb skeleton page for attribution 2013-12-08 14:15:30 -06:00
Andrew Brown
fc51cbc4b4 fix sizing on magic appearance tab long-form content fields 2013-04-21 21:53:00 -05:00
Andrew Brown
e31bea922a add more possible races 2013-04-21 04:03:44 -05:00
Andrew Brown
5a202933c4 ton of weapon/character/armor api endpoints 2013-04-21 03:35:21 -05:00
Andrew Brown
dd9e05e727 add more api generator endpoints 2013-04-21 02:05:44 -05:00
Andrew Brown
8aedfc7dd1 redirect to signup page, not login page 2013-03-11 03:17:03 -05:00
Andrew Brown
a03a10e135 anon info page 2013-03-10 23:11:17 -05:00
Andrew Brown
e17cf877ed onboarding process from anon account to real account 2013-03-10 22:40:48 -05:00
Andrew Brown
ce79faa660 escape nasty html and give index columns widths 2013-03-10 20:32:32 -05:00
Andrew Brown
bc668ca53e remove diana from location name gneerator 2013-03-04 02:07:35 -06:00
Andrew Brown
60b1ea39f6 remove space in location name generator 2013-03-04 01:00:15 -06:00
Andrew Brown
7404bd63e6 password hashing (finally) 2013-03-03 20:14:37 -06:00
Andrew Brown
c38ff6222e location name generator 2013-03-03 17:38:54 -06:00
Andrew Brown
95fcab50fb random character age generation 2013-03-03 16:40:51 -06:00
Andrew Brown
aa84b7070a name randomization for characters 2013-03-03 16:30:59 -06:00
Andrew Brown
28f5dcc7e6 random name generator 2013-03-03 02:52:58 -06:00
Andrew Brown
42de9c3c0d don't throw an error when filtering universe and no characters exist{ 2013-02-25 22:26:00 -06:00
Andrew Brown
f785c9d6f9 redirect from homepage to dashboard if logged in 2013-02-25 22:21:52 -06:00
Andrew Brown
3f1ed219c6 redirect to dashboard on login 2013-02-25 21:28:51 -06:00
Andrew Brown
ffb167f0f5 initial nonlinking stats on dashboard 2013-02-25 21:27:19 -06:00
Andrew Brown
0010b08557 add dashboard page 2013-02-25 21:18:17 -06:00
Andrew Brown
afe8630478 add nl2br 2013-02-25 19:12:53 -06:00
Andrew Brown
793db6be28 allow people to log in anonymously 2013-01-22 19:40:30 -06:00
Andrew Brown
e8bf589cc6 show selected universe name in filter 2013-01-21 23:44:24 -06:00
Andrew Brown
dc52c90d75 remove characters from universes 2013-01-10 03:43:16 -06:00
Andrew Brown
dd4a38c650 assign characters to universes 2013-01-10 03:10:43 -06:00
Andrew Brown
5ab1567a4c make filter select work on character selection page 2013-01-10 02:49:20 -06:00
Andrew Brown
7f8b3c401d filter characters by universe 2013-01-10 02:38:25 -06:00
Andrew Brown
42721e3a3d add universes 2013-01-10 02:05:55 -06:00
Andrew Brown
54bd06f35f magic is here 2013-01-01 23:04:47 -06:00
Andrew Brown
21cd7f9f04 don't show empty pickers 2013-01-01 21:22:45 -06:00
Andrew Brown
a1eccc7da9 omg pickers work 2013-01-01 20:57:14 -06:00
Andrew Brown
9a70863fe7 better structure for pickers 2013-01-01 20:15:11 -06:00
Andrew Brown
77336bb096 working picker for character forms 2013-01-01 19:58:48 -06:00
Andrew Brown
15b1202586 languages and locations sorted alphabetically: 2013-01-01 02:29:46 -06:00
Andrew Brown
6119fb5605 display equipment alphabetically 2013-01-01 02:19:35 -06:00
Andrew Brown
c3934f5ca6 sort characters alphabetically 2013-01-01 02:18:30 -06:00
Andrew Brown
30b2e1f583 locations 2012-12-28 00:38:54 -06:00
Andrew Brown
ce1f25fcee languages 2012-12-27 23:25:32 -06:00
Andrew Brown
ca8beb18dc languages 2012-12-27 23:18:41 -06:00
Andrew Brown
fd27bed6d8 routes / coming soon pages 2012-12-27 20:36:41 -06:00
Andrew Brown
4b91f4ccdc equipment (exclamation mark) 2012-12-26 23:30:04 -06:00
Andrew Brown
e045883840 wtf when did it get 7am 2012-12-24 06:49:42 -06:00
Andrew Brown
3f1393ea8f login/signup/anon page updated with tabs 2012-12-24 05:25:06 -06:00
Andrew Brown
f96c9d2abd characters bootstrapped 2012-12-24 00:18:50 -06:00
Andrew Brown
393ce2b6e4 bootstrapped user 2012-12-23 23:23:00 -06:00
Andrew Brown
9719d4ebc2 Validations on user signup 2012-12-23 22:33:59 -06:00
Andrew Brown
4cddbd3c2c fixed user redirection stuff 2012-12-23 20:35:16 -06:00
Andrew Brown
860a83e90f proper routes and links 2012-12-23 19:59:38 -06:00
Andrew Brown
8f587c75f2 restrict seeing characters only to owners 2012-12-23 19:44:59 -06:00
Andrew Brown
722d742266 character creation requires user to be logged in 2012-12-23 18:10:03 -06:00
Andrew Brown
34689fa706 characters scaffolding 2012-12-23 17:42:28 -06:00
Andrew Brown
d410015fdc bulletproofing 2012-12-23 03:09:32 -06:00
Andrew Brown
0c4ecfda64 forgot a word 2012-12-23 02:42:37 -06:00
Andrew Brown
268b1bc7b9 main controller and misc changes 2012-12-23 02:32:39 -06:00
Andrew Brown
d00045eedf started drinking 2012-12-22 23:50:10 -06:00
Andrew Brown
69110c64e9 users scaffold 2012-12-22 20:24:25 -06:00
Andrew Brown
bb7c5eeee4 rails app 2012-12-22 17:39:34 -06:00