Commit Graph
326 Commits
Author SHA1 Message Date
David Jay e032a5521e Merge branch 'master' of github.com:coralproject/talk into wordlist 2016-12-09 13:05:11 -05:00
Dan Zajdband 09ba535d68 Merge with master 2016-12-09 10:17:55 -05:00
Riley Davis 4572d8e68e filter by premod status 2016-12-08 12:20:54 -10:00
Dan Zajdband fed41e1fba Linted code 2016-12-08 16:59:29 -05:00
Riley DavisandGitHub be2d9838e6 Merge branch 'master' into wordlist 2016-12-08 09:13:48 -10:00
Belén CurcioandGitHub 0c050bdec9 Merge branch 'master' into like-login-prompt 2016-12-08 15:53:16 -03:00
David Jay e91564f706 Merge branch 'master' of github.com:coralproject/talk into like-login-prompt 2016-12-08 13:49:15 -05:00
David Jay 9b5d85aaef Merge branch 'wordlist' of github.com:coralproject/talk into wordlist 2016-12-08 13:26:02 -05:00
David Jay 6d701ef49e Updating to detect new status format. 2016-12-08 13:25:18 -05:00
David Jay 8446c49c14 Fixing error when posting comment. 2016-12-08 13:08:18 -05:00
Dan Zajdband fb392422ea Added textarea for closed message on admin 2016-12-08 12:44:02 -05:00
Riley DavisandGitHub 6247510cd7 Merge branch 'master' into wordlist 2016-12-07 16:15:23 -10:00
Riley DavisandGitHub e56583e250 Merge branch 'master' into bugfix-for-permalink-path 2016-12-07 09:11:22 -10:00
Riley Davis 260d1bd9f4 restoring the scroll to comment functionality 2016-12-06 16:29:40 -10:00
Riley Davis d9d9c50961 un-sneaking in some stuff 2016-12-06 15:52:22 -10:00
Riley Davis 1201196566 un-sneaking in some stuff 2016-12-06 15:51:22 -10:00
Riley Davis 09245403aa riley is silly 2016-12-06 14:42:09 -10:00
Riley Davis f2ded3f2a7 replace things multiple times 2016-12-06 14:34:27 -10:00
Riley Davis 31c87cb93f make the translation function accept n arguments. ninja bugfix to permalink 2016-12-06 14:17:01 -10:00
Riley DavisandGitHub f2c751f9f0 Merge branch 'master' into i18n-var 2016-12-06 13:41:44 -10:00
David Jay 17e4e57171 Merge branch 'wordlist' of github.com:coralproject/talk into wordlist 2016-12-06 12:54:39 -05:00
David Jay 582c0c0c9e Handling case where child and parent_id are undefined. 2016-12-06 12:53:35 -05:00
David JayandGitHub 3562d9f235 Merge branch 'master' into wordlist 2016-12-05 17:44:23 -05:00
Belén CurcioandGitHub 67aa261a56 Merge branch 'master' into stream-e2e 2016-12-05 19:34:57 -03:00
Belen Curcio 08e232c4fe User Should still be able to see sign info even if its closed // moving comp 2016-12-05 19:28:47 -03:00
Belen Curcio 03b6ec4fe4 Lint 2016-12-05 19:18:29 -03:00
Dan Zajdband 568e46f1e3 Added restricted wrapper 2016-12-05 17:02:21 -05:00
Dan Zajdband 62cc489c21 Merge with master 2016-12-05 16:39:00 -05:00
Dan Zajdband 95ec57c64d Added default message on thread 2016-12-05 11:11:21 -05:00
Dan Zajdband 4be258c63d Added simple open/close flow 2016-12-05 11:02:39 -05:00
Kim GardnerandGitHub e528e0678f Merge branch 'master' into stream-e2e 2016-12-04 00:49:27 -05:00
gaba 60d4793111 Adds a variable to the possible translations. 2016-12-02 16:12:24 -08:00
David Jay ead66520e2 Adjusting height of login button to match current comment. 2016-12-02 17:01:06 -05:00
David ErwinandGitHub e6a32c91a2 Merge branch 'master' into wordlist 2016-12-02 16:02:44 -05:00
David ErwinandGitHub f2273f1698 Merge branch 'master' into like-login-prompt 2016-12-02 15:58:54 -05:00
David Jay 0eca9eeadc Prompting login when a loggout out user likes or comments. 2016-12-02 15:45:26 -05:00
David Jay b1d0f8443f Updating infobox styling. 2016-12-02 12:47:18 -05:00
David Jay 0e75319c04 Moving banned wordlist text to translations. 2016-12-01 21:49:55 -05:00
David Jay b5b0cd9b12 Adding banned word notification on post. 2016-12-01 21:32:08 -05:00
David Jay 2cb439ccf8 Reloading banned word list from settings. 2016-12-01 21:12:13 -05:00
David Jay a91b73e94a Fixing bug when writing settings to state. 2016-12-01 20:26:48 -05:00
David Jay 827b94001a Changing save button color when settings are changed 2016-12-01 20:24:34 -05:00
David Jay a16faddac6 Adding banned word list. 2016-12-01 20:11:33 -05:00
David Jay 957837169f Moving configuration sections to seperate files. 2016-12-01 19:35:35 -05:00
David Jay ef58c439f2 Adding banned word list menu option. 2016-12-01 18:46:02 -05:00
David Jay e5fe91af8b Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e 2016-12-01 18:25:08 -05:00
David Jay a118d263ea Cleaning url regex in commentstream. 2016-12-01 16:23:33 -05:00
David Jay d853b1f912 Merging master into stream-e2e 2016-12-01 14:36:47 -05:00
Belen Curcio 647fb06c99 HandleSave on Submit 2016-12-01 12:58:37 -03:00
Belen Curcio 990782a542 Sign in a restricted rout 2016-12-01 11:17:07 -03:00