Commit Graph

4221 Commits

Author SHA1 Message Date
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
166618e36c
Merge branch 'master' into ruby-versions-docs 2018-06-28 20:36:52 -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
b15a35c61a Update ruby versions 2018-06-28 15:16:06 -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
Andrew Brown
76e8a5554f
Merge pull request #275 from indentlabs/forum-ui-changes
Forum ui changes
2018-06-19 21:58:28 -05:00
Andrew Brown
e007a93f12
Merge branch 'master' into fix-attribute-dropdowns 2018-06-19 21:57:32 -05:00
Tristan
bab6b60477 delete all the views we don't override 2018-06-19 21:53:59 -05:00
Tristan
329b195afb Copy our modifications over 2018-06-19 21:51:23 -05:00
Tristan
664e0adfee latest thredded views 2018-06-19 21:26:13 -05:00
Tristan
63bdd37857 use new moderator flag 2018-06-19 21:17:02 -05:00
Andrew Brown
0037e5995e
Merge pull request #273 from indentlabs/thredded-15
Upgrade thredded to 0.15.3
2018-06-19 21:01:59 -05:00
Andrew Brown
587137deb0
Merge branch 'master' into fix-attribute-dropdowns 2018-06-19 20:59:34 -05:00
Andrew Brown
c69e4cf390
Merge branch 'master' into thredded-15 2018-06-19 20:59:24 -05:00
Andrew Brown
c6610669eb Upgrade sprockets 2018-06-19 20:55:44 -05:00
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
Tristan
b1ea406029 Upgrade thredded to 0.15.3 2018-06-19 20:19:33 -05:00
Tristan
47bfa9b6a6 Fix dropdown issue from materialize upgrade 2018-06-19 19:43:52 -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
Tristan
075919d857 Upgrade thredded to 0.15.1 2018-06-09 15:02:45 -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