Commit Graph

1942 Commits

Author SHA1 Message Date
Andrew Brown
786e71076d Merge branch 'master' of github.com:indentlabs/notebook 2018-06-19 20:55:11 -05:00
Andrew Brown
8b285ddebf
Merge pull request #274 from indentlabs/forum-moderators
Add forum moderator flag to users
2018-06-19 20:41:42 -05:00
Tristan
6980a4de7f add forum moderator flag to users 2018-06-19 20:30:53 -05:00
Andrew Brown
9ee4db48f0 restart 2018-06-18 18:13:14 -05:00
Andrew Brown
187c9bf369 fix another materialize/thredded conflict 2018-06-12 23:50:22 -05:00
Andrew Brown
281d96d4a6 restart 2018-06-10 21:25:47 -05:00
Andrew Brown
6ba7387098 restart 2018-06-09 22:00:43 -05:00
Andrew Brown
d1a39a5eac Merge branch 'master' of github.com:indentlabs/notebook 2018-06-09 14:34:19 -05:00
Andrew Brown
dc47809815
Merge pull request #271 from indentlabs/materialize-upgrades
UI/UX changes
2018-06-09 14:34:09 -05:00
Tristan
8d48ee9a61 Merge branch 'materialize-upgrades' of https://github.com/indentlabs/notebook into materialize-upgrades 2018-06-09 14:20:08 -05:00
Tristan
a88a7f2320 add the missing pages to the privacy policy 2018-06-09 14:18:06 -05:00
Andrew Brown
c1970e28b6
Merge branch 'master' into materialize-upgrades 2018-06-09 14:04:28 -05:00
Andrew Brown
e97c6d262a restart 2018-06-07 15:04:05 -05:00
Tristan
2656f1c598 Fill character autocomplete suggestions 2018-06-07 02:22:42 -05:00
Tristan
7fe9a7914e Extract current autocomplete options to a service 2018-06-07 01:20:08 -05:00
Tristan
c158ad0b68 add autocomplete indicators + helpful tooltip 2018-06-07 00:52:16 -05:00
Tristan
8df982d3f9 clean up assets 2018-06-07 00:37:05 -05:00
Tristan
e543bf3d03 upgrade forum to materialize 1.0-beta also 2018-06-07 00:35:58 -05:00
Tristan
bf242a8e87 Re-add changes that got lost somewhere along the way 2018-06-07 00:32:54 -05:00
Tristan
995d353ae6 Improve search UI/UX 2018-06-07 00:06:48 -05:00
Tristan
c534d84bd4 enable field autocomplete 2018-06-06 23:17:49 -05:00
Tristan
826f962eec Upgrade to materialize 1.0 beta 2018-06-06 23:13:28 -05:00
Tristan
967ad03632 add on-click color wave effects to navbar 2018-06-06 21:57:46 -05:00
Tristan
9e3fac1be4 Remove adsense placeholder 2018-06-06 21:57:22 -05:00
Andrew Brown
7c9f0ed79f
Merge pull request #270 from indentlabs/fix-uploads
include the new aws gem
2018-06-06 01:22:19 -05:00
Tristan
031585547b include the new aws gem 2018-06-06 01:16:51 -05:00
Tristan
fd322bf7b2 polish content lists 2018-06-06 01:07:30 -05:00
Tristan
73662c22da redesign content list partial 2018-06-06 00:48:03 -05:00
Andrew Brown
73b4a95bc6
Merge pull request #269 from indentlabs/upgrade-thredded
Upgrade other gems
2018-06-05 23:54:58 -05:00
Tristan
3ac0937fa8 pg 1.0 not compatible with rails 5.1 yet 2018-06-05 23:48:39 -05:00
Tristan
7b9bd4b150 swap factory_girl with factory_bot 2018-06-05 23:45:39 -05:00
Tristan
4142508c08 Include simplecov manually 2018-06-05 21:51:42 -05:00
Tristan
0473c30a03 Gem upgrades 2018-06-05 21:41:46 -05:00
Tristan
c162747138 upgrade thredded 2018-06-05 21:28:16 -05:00
Andrew Brown
82c8a97458
Merge pull request #268 from indentlabs/modernize-stack
Modernize ruby, bundler, and several gems
2018-06-05 21:10:51 -05:00
Tristan
67e1dae46c Add pg back to test environment gem list 2018-06-05 20:24:36 -05:00
Tristan
af0756e7fd update devise and dependencies 2018-06-05 20:21:27 -05:00
Tristan
158c794f5d Modernize ruby, bundler, and several gems 2018-06-05 20:17:00 -05:00
Andrew Brown
c939688014 Merge branch 'master' of github.com:indentlabs/notebook 2018-06-05 19:46:38 -05:00
Andrew Brown
b7f1d63fb7
Merge pull request #267 from euank/quick💨add
Quick💨add
2018-05-28 20:05:08 -05:00
Andrew Brown
eaea6ded7a restart 2018-05-25 17:32:15 -05:00
Euan Kemp
aa6aed7131 Require a 'name' in quick-add
Before this change it was very easy to click 'quick-add' and have a
blank line be added which would vanish on refresh.

There's additional issues present here which should be addressed, but I
think this resolves the sharpest edge for a user to run into.
2018-05-22 22:22:20 -07:00
Euan Kemp
97e85d46bd use 'bundle's version of 'rails'
Installing rails using 'gem' is much more tricky to manage than using
the version set in the Gemfile via 'bundle exec'
2018-05-22 22:21:54 -07:00
Andrew Brown
b962c08286 restart 2018-04-27 20:09:58 -05:00
Andrew Brown
dfb360f667 restart 2018-04-27 12:44:20 -05:00
Andrew Brown
9aeb029853 restart heroku 2018-04-22 19:26:45 -05:00
Andrew Brown
56f27ab2f6 restart 2018-04-20 19:03:03 -05:00
Andrew Brown
7b97425348 restart servers 2018-04-18 17:04:14 -05:00
Andrew Brown
b688d40054 restart server 2018-04-18 14:19:18 -05:00
Andrew Brown
5d8ee69979 Upgrade thredded again 2018-04-16 22:05:16 -05:00