Commit Graph

3255 Commits

Author SHA1 Message Date
Kim Gardner 7e34bc1d13 Merge pull request #477 from gobengo/ignore
Ignore User
2017-04-13 20:05:02 -04:00
Kim Gardner 193ed8c863 Merge branch 'master' into ignore 2017-04-13 20:00:59 -04:00
Riley Davis 018e88f7cf Merge pull request #495 from coralproject/143357607-close-stream
Bug on closing the stream
2017-04-13 15:28:43 -06:00
gaba c395bc8849 Adds closedAt to state... and check that closedTimeout settings exists for the Asset. 2017-04-13 14:21:45 -07:00
Wyatt Johnson 7bcd336f51 Merge pull request #492 from coralproject/plugins-install-fix
Ignore lifecycle hooks during plugin install
2017-04-13 12:56:45 -06:00
Benjamin Goering 118da885fd Merge branch 'master' of github.com:coralproject/talk into ignore_rb2 2017-04-13 12:12:10 -05:00
Wyatt Johnson f7ee08bd3a Ignore lifecycle hooks during plugin install 2017-04-12 14:39:11 -06:00
David Erwin b3ce4507a3 Merge pull request #476 from coralproject/metadata
MetadataService
v1.5.0
2017-04-12 16:02:39 -04:00
David Erwin c7e1943272 Merge branch 'master' into metadata 2017-04-12 15:57:24 -04:00
Kim Gardner 3e882452db Merge pull request #491 from coralproject/fix-broken-links
Fix broken links to Stories page
2017-04-12 15:45:01 -04:00
Kim Gardner 29fe5e2901 Fix broken links to Stories page 2017-04-12 15:40:34 -04:00
Kim Gardner 29aacdc00e Merge pull request #490 from coralproject/fix-more-buttons
Fix load more buttons
2017-04-12 15:18:06 -04:00
Kim Gardner d892d1327d Merge branch 'master' into fix-more-buttons 2017-04-12 15:12:27 -04:00
Kim Gardner 309b41a3cf Merge pull request #485 from coralproject/143520139-permalink-show-all
Clicking '# comments' tab refresh all the comments back
2017-04-12 15:11:42 -04:00
gaba cbde4cc8bc Removes handleClick as it is working now with the changeTab (as the viewAllComments was added). /cc @kiwi 2017-04-12 11:58:41 -07:00
Chi Vinh Le 81bd983f0b Handle empty stream case 2017-04-13 01:34:27 +07:00
Chi Vinh Le 92205a2c6f Fix load more buttons 2017-04-13 01:17:46 +07:00
gaba 48795b29bf Removes isAdmin for refetching when changing tabs. 2017-04-12 10:41:15 -07:00
gaba f4f8e5053f Remove the binding in the constructor. 2017-04-12 10:12:00 -07:00
Gabriela Rodríguez Berón 51774323de Merge branch 'master' into 143520139-permalink-show-all 2017-04-12 10:10:17 -07:00
Wyatt Johnson 191026ecf2 Merge branch 'master' into metadata 2017-04-12 10:37:12 -06:00
Wyatt Johnson c19e2979fc Merge pull request #489 from coralproject/fix-double-quote-typos
Double quotes should be single
2017-04-12 08:14:02 -06:00
Kim Gardner a19d6544a7 Don't need to escape single quotes within double quotes 2017-04-12 10:05:21 -04:00
Kim Gardner d74cdd938f Double quotes should be single 2017-04-12 09:51:32 -04:00
Wyatt Johnson d4aa2011ff Merge pull request #488 from coralproject/bump-version-update-description
Bump version and update description
2017-04-12 07:39:12 -06:00
Kim Gardner 8e76a34631 Bump version and update description 2017-04-12 08:45:19 -04:00
Kim Gardner 143ce795c3 Merge branch 'master' into 143520139-permalink-show-all 2017-04-12 08:14:39 -04:00
Kim Gardner 358743b3ab Merge pull request #486 from coralproject/styling-fixes
Styling fixes
2017-04-12 07:37:14 -04:00
Belén Curcio 1f862cce74 Merge branch 'master' into 143520139-permalink-show-all 2017-04-12 08:27:37 -03:00
Kim Gardner 6f4d591d0b Merge branch 'master' into styling-fixes 2017-04-12 07:23:56 -04:00
Kim Gardner c084c92c31 Merge pull request #487 from coralproject/validator-fix
Fixed plugin validation
2017-04-12 07:23:05 -04:00
Belen Curcio 1a678a0cb3 Removing username -- with lintin 2017-04-12 08:21:39 -03:00
Belen Curcio cc0f757746 Removing username 2017-04-12 08:16:02 -03:00
Wyatt Johnson 6ac4bcf796 Fixed plugin validation 2017-04-11 22:25:13 -06:00
Belen Curcio 2e3021e66b Linting 2017-04-11 22:17:04 -03:00
Belen Curcio 63b630833a Fake Comment Style 2017-04-11 22:12:10 -03:00
Belen Curcio e4aa98b87a Hidding login as 2017-04-11 22:00:55 -03:00
gaba f900727455 Move the method to the class, changes name and removes wrapper. 2017-04-11 17:57:56 -07:00
Belen Curcio 3c6ce7a80f QuestionBox 2017-04-11 21:56:43 -03:00
Gabriela Rodríguez Berón f44798361e Merge branch 'master' into 143520139-permalink-show-all 2017-04-11 15:06:22 -07:00
gaba 56dedb551f Adds click to showAll and refresh query to the '# comments' tab. 2017-04-11 15:02:04 -07:00
Kim Gardner b15fd7acbf Merge pull request #484 from coralproject/plugin-fixes
Fixed bugs with plugin install
2017-04-11 17:56:13 -04:00
Kim Gardner 1dcfa269b3 Merge branch 'master' into plugin-fixes 2017-04-11 17:51:18 -04:00
Kim Gardner 36dff1afb8 Merge pull request #483 from coralproject/143202269-suspend-user-email
Adds missing template.
2017-04-11 17:51:02 -04:00
Benjamin Goering fbcea2de6d Merge branch 'master' into ignore 2017-04-11 14:49:56 -07:00
Kim Gardner 3307bf5ef5 Merge branch 'master' into 143202269-suspend-user-email 2017-04-11 17:46:58 -04:00
Kim Gardner f6cb97e29c Merge pull request #482 from coralproject/flash-messages
Flash Messages fix
2017-04-11 17:46:44 -04:00
Benjamin Goering 247583b858 Merge branch 'ignore' of github.com:gobengo/talk into ignore 2017-04-11 14:33:10 -07:00
Benjamin Goering 8cf2130e25 Update spanish translation for commentIsIgnored 2017-04-11 14:31:46 -07:00
Gabriela Rodríguez Berón 295f4ddec2 Merge branch 'master' into ignore 2017-04-11 14:26:53 -07:00