Commit Graph

4095 Commits

Author SHA1 Message Date
Andrew Brown
fac9915571 desync db pool from thread count 2020-07-06 12:12:24 -07:00
Andrew Brown
d6a067558c safety 2020-07-06 03:41:36 -07:00
Andrew Brown
a453307284 safety check 2020-07-06 03:32:35 -07:00
Andrew Brown
af0601af3d permissions 2020-07-06 03:05:11 -07:00
Andrew Brown
78f5be2fbb suspicious 500 fix 2020-07-06 02:16:25 -07:00
Andrew Brown
a8933bf5bd Merge branch 'master' of github.com:indentlabs/notebook 2020-07-06 01:15:34 -07:00
Andrew Brown
344c0d3013
Merge pull request #693 from indentlabs/dependabot/bundler/ruby-prof-1.4.1
Bump ruby-prof from 1.3.2 to 1.4.1
2020-07-06 03:13:55 -05:00
Andrew Brown
674ee27a2c
Merge branch 'master' into dependabot/bundler/ruby-prof-1.4.1 2020-07-06 03:13:47 -05:00
Andrew Brown
009d90c59e
Merge pull request #691 from indentlabs/dependabot/bundler/better_errors-2.7.1
Bump better_errors from 2.7.0 to 2.7.1
2020-07-06 03:12:58 -05:00
Andrew Brown
c2d9cbd9ec
Merge branch 'master' into dependabot/bundler/better_errors-2.7.1 2020-07-06 03:12:46 -05:00
Andrew Brown
c4ba988328
Merge pull request #690 from indentlabs/dependabot/bundler/database_cleaner-1.8.5
Bump database_cleaner from 1.8.4 to 1.8.5
2020-07-06 03:12:42 -05:00
Andrew Brown
8d4df81e6c
Merge branch 'master' into dependabot/bundler/database_cleaner-1.8.5 2020-07-06 03:12:33 -05:00
Andrew Brown
748820784f
Merge pull request #694 from indentlabs/dependabot/bundler/csv-3.1.5
Bump csv from 3.1.2 to 3.1.5
2020-07-06 03:11:34 -05:00
Andrew Brown
be97f4761e
Merge pull request #698 from indentlabs/dependabot/bundler/puma-4.3.5
Bump puma from 4.3.3 to 4.3.5
2020-07-06 03:11:20 -05:00
Andrew Brown
1414f0d9aa
Merge pull request #702 from indentlabs/dependabot/npm_and_yarn/websocket-extensions-0.1.4
Bump websocket-extensions from 0.1.3 to 0.1.4
2020-07-06 03:11:10 -05:00
Andrew Brown
8d64d1dd49
Merge pull request #707 from indentlabs/dependabot/bundler/web-console-4.0.3
Bump web-console from 4.0.1 to 4.0.3
2020-07-06 03:10:58 -05:00
Andrew Brown
c673add2b4
Merge branch 'master' into dependabot/bundler/web-console-4.0.3 2020-07-06 03:10:49 -05:00
Andrew Brown
29178e0b1d
Merge pull request #708 from indentlabs/dependabot/bundler/rubocop-0.86.0
Bump rubocop from 0.82.0 to 0.86.0
2020-07-06 03:10:18 -05:00
Andrew Brown
3c8b15ceb3
Merge branch 'master' into dependabot/bundler/database_cleaner-1.8.5 2020-07-06 03:07:23 -05:00
Andrew Brown
2449b5fdd1
Merge branch 'master' into dependabot/bundler/better_errors-2.7.1 2020-07-06 03:07:21 -05:00
Andrew Brown
bdf45a3fb1
Merge branch 'master' into dependabot/bundler/ruby-prof-1.4.1 2020-07-06 03:07:18 -05:00
Andrew Brown
96b9747ed6
Merge branch 'master' into dependabot/bundler/csv-3.1.5 2020-07-06 03:07:15 -05:00
Andrew Brown
482fb9dc93
Merge branch 'master' into dependabot/npm_and_yarn/websocket-extensions-0.1.4 2020-07-06 03:07:04 -05:00
Andrew Brown
381e701998
Merge branch 'master' into dependabot/bundler/web-console-4.0.3 2020-07-06 03:07:02 -05:00
Andrew Brown
fda962e583
Merge branch 'master' into dependabot/bundler/rubocop-0.86.0 2020-07-06 03:06:53 -05:00
Andrew Brown
e2fc3d361c attribution oopsie 2020-07-06 00:56:04 -07:00
Andrew Brown
ed498d0f48 another fix 2020-07-06 02:43:25 -05:00
Andrew Brown
4409f4ed61 quick image fix 2020-07-06 02:42:23 -05:00
Andrew Brown
d086f9ae21 formatting 2020-07-06 02:24:46 -05:00
dependabot[bot]
21b3216cbc
Bump puma from 4.3.3 to 4.3.5
Bumps [puma](https://github.com/puma/puma) from 4.3.3 to 4.3.5.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-06 07:00:23 +00:00
Andrew Brown
9504e1e15a
Merge pull request #651 from indentlabs/collaboration-expansion
Collaboration/social stuff (WIP)
2020-07-06 01:59:04 -05:00
Andrew Brown
f851211b8a some custom cover images 2020-07-06 01:52:35 -05:00
Andrew Brown
efa18af5f8 add collections tab to some user profiles 2020-07-06 01:47:28 -05:00
Andrew Brown
a332def59c final polish 2020-07-05 21:05:21 -05:00
Andrew Brown
716807025c tackling final todos 2020-07-05 20:29:41 -05:00
Andrew Brown
f69c1a9794 hide messages from users you've blocked 2020-07-05 20:04:27 -05:00
Andrew Brown
a272c2837a bundle update 2020-07-05 19:52:24 -05:00
Andrew Brown
1b978c5a77 share dark preferences across root templates 2020-07-05 19:47:33 -05:00
Andrew Brown
f2e3e89163 more end-of-list checks 2020-07-05 19:32:46 -05:00
Andrew Brown
75bc07f0b3 temp fix for weird css 2020-07-05 19:15:51 -05:00
Andrew Brown
9f5c0ab5f3 minor random polish 2020-07-05 19:10:00 -05:00
Andrew Brown
cf14b2cc41 wrapping up random todos 2020-07-05 19:04:01 -05:00
Andrew Brown
aa058d08b9 show the timeline editor before creating any timelines 2020-07-05 18:00:28 -05:00
Andrew Brown
6c844f687e delete timelines 2020-07-05 17:42:37 -05:00
Andrew Brown
e44f17b0ad timelines#index for premium users 2020-07-05 17:30:25 -05:00
Andrew Brown
efc04a3a0a hey it works 2020-07-05 17:01:34 -05:00
Andrew Brown
6e98fa5c92 wip timeline event template cloning 2020-07-04 17:25:23 -05:00
Andrew Brown
3d533ea7d8 deleting timeline events 2020-07-03 19:03:57 -05:00
Andrew Brown
fb1fc25b47 universe autosave on timeline editor 2020-07-03 18:38:16 -05:00
Andrew Brown
a28bd98070 timeline event entity removal 2020-07-03 18:03:53 -05:00