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
2,005 Commits 83 Branches 44 Tags 172 MiB
f2e10b0d6d
Commit Graph

2005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Brown
f2e10b0d6d
Merge pull request #283 from indentlabs/rails5-upgrade 
[WIP] `rake rails:update` & Rails 5 upgrade
 2018-08-15 17:51:27 -05:00
Andrew Brown
90990320c1 Merge branch 'rails5-upgrade' of github.com:indentlabs/notebook into rails5-upgrade 2018-08-15 17:43:43 -05:00
Andrew Brown
dab5d5f0ea Merge branch 'master' into rails5-upgrade 2018-08-15 16:31:37 -05:00
Andrew Brown
534f206f40 restart 2018-08-15 16:25:01 -05:00
Tristan
f67937c937 only show recently edited pages dropdown if page count > 0 2018-08-14 18:32:48 -05:00
Andrew Brown
8c570303bf restart 2018-08-13 22:59:52 -05:00
Tristan
1a24d00bd1 oops, undo that last bit 2018-08-08 11:50:56 -05:00
Tristan
40d481ed5d adjust image sizes 2018-08-08 11:46:39 -05:00
Tristan
a816362bcd fix paperclip polymorphism issue 2018-08-08 11:42:17 -05:00
Andrew Brown
b2f1415e34 restart 2018-08-07 18:17:48 -05:00
Andrew Brown
c619f6f662 restart 2018-08-03 13:49:32 -05:00
Andrew Brown
7600564bd5 restart 2018-07-28 16:41:05 -05:00
Tristan
66dec09d6b wMerge branch 'master' of https://git.heroku.com/papercut-server into rails5-upgrade 2018-07-25 18:44:16 -05:00
Tristan
1ec410351f TEMPORARY COMMIT FOR STAGING 2018-07-25 18:41:56 -05:00
Tristan
eb6b77fe09 newer bundler 2018-07-25 16:07:14 -05:00
Tristan
a13efa29c4 update .tool-versions 2018-07-24 17:12:17 -05:00
Andrew Brown
e242e941fc restart 2018-07-22 23:03:25 -05:00
Andrew Brown
8dd5338774 restart heroku 2018-07-22 00:27:56 -05:00
Andrew Brown
fc9bedf32e restart 2018-07-22 00:22:10 -05:00
Andrew Brown
6783093d1b
Merge pull request #285 from indentlabs/atheist-religions 
Let users link deities to religions.
 2018-07-21 18:53:48 -05:00
Andrew Brown
0e37ee36cf :((((((((((((((( 2018-07-21 18:48:06 -05:00
Andrew Brown
43528f6f61 Link deities to religions 2018-07-21 18:06:58 -05:00
Andrew Brown
a5784576b6 Add deity link to religions 2018-07-15 13:52:40 -05:00
Andrew Brown
e0f01a6bd2 restart 2018-07-15 13:05:32 -05:00
Andrew Brown
5d09a873c6 bar link 2018-07-14 15:10:29 -05:00
Andrew Brown
b47e76e456 fix nav positioning 2018-07-14 14:18:40 -05:00
Andrew Brown
aca9a94fe4 rip 2018-07-14 14:14:32 -05:00
Andrew Brown
c315ba66b3
Merge branch 'master' into rails5-upgrade 2018-07-12 01:32:17 -05:00
Andrew Brown
0d52bb5eb1 restart server 2018-07-11 21:43:33 -05:00
Andrew Brown
7a4c9dfbc1 update tests for 5.2 2018-07-05 02:07:12 -05:00
Andrew Brown
ec67c23b7d address deprecations 2018-07-05 01:35:40 -05:00
Andrew Brown
51787a383a rails 5.2.0 2018-07-05 01:24:00 -05:00
Andrew Brown
1a666a9654 oops 2018-07-05 01:19:03 -05:00
Andrew Brown
59904a861d rails 5 prep 2018-07-05 01:10:52 -05:00
Andrew Brown
f6d80346df thredded migrations 2018-07-04 21:01:14 -05:00
Andrew Brown
dea2d24e9b Check in .tool-versions 2018-07-04 20:58:12 -05:00
Tristan
01f58d99b8 restore routes 2018-07-04 20:48:40 -05:00
Tristan
52bac9fd48 restore i18n file 2018-07-04 20:47:38 -05:00
Tristan
3f3c3cb3e6 upgrade fixes 2018-07-04 20:46:21 -05:00
Tristan
79b626d9a2 rake rails:update 2018-07-04 20:14:51 -05:00
Andrew Brown
0147567c63
Merge pull request #278 from indentlabs/remember-me-mobile 
Re-show checkboxes that were hidden by materialize
 2018-06-29 09:09:20 -05:00
Andrew Brown
2eb2c1980b
Merge branch 'master' into remember-me-mobile 2018-06-28 20:35:58 -05:00
Andrew Brown
318ef0957e
Merge pull request #279 from indentlabs/billing-improvements 
Add USD to billing amounts
 2018-06-28 20:35:46 -05:00
Tristan
36725b2b05 Add USD to billing amounts 2018-06-28 15:05:44 -05:00
Tristan
65442c1818 Re-show checkboxes that were hidden by materialize 2018-06-28 14:51:25 -05:00
Andrew Brown
8ad9d24b8b restart 2018-06-23 09:39:02 -05:00
Andrew Brown
9b8429bd7e restart 2018-06-22 09:56:53 -05:00
Andrew Brown
cc30b64a52
Merge pull request #276 from indentlabs/resurface-badges 
Show user badges on the forums
 2018-06-20 00:49:03 -05:00
Tristan
24dc045ccf include user badges 2018-06-20 00:46:51 -05:00
Andrew Brown
869aef3dca
Merge pull request #272 from indentlabs/fix-attribute-dropdowns 
Fix dropdown issue from materialize upgrade
 2018-06-19 21:59:19 -05:00