wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-10 01:40:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
902 Commits 10 Branches 125 Tags
ba169147e73d12bf108517c745bc0c3cf191008a
Commit Graph

367 Commits

Author SHA1 Message Date
Gabriela Rodríguez Berón ba169147e7 Merge branch 'master' into ban-user 2016-12-09 10:28:32 -10:00
Riley Davis 44ae886af7 put some space between buttons on the banuserdialog 2016-12-09 10:08:55 -10:00
gaba 01dc4e4144 fix merge. 2016-12-09 08:30:30 -10:00
gaba 15557c16e2 Merge branch 'master' into ban-user 2016-12-09 08:28:46 -10:00
Belen Curcio 3ef8f295c3 newConfig update 2016-12-09 12:59:17 -03:00
Belen Curcio b33713e723 Changes to master 2016-12-09 12:32:59 -03:00
Belen Curcio e4df3bcafc Merge branch 'master' of github.com:coralproject/talk into asset-comment-settings 2016-12-09 12:28:40 -03:00
Dan Zajdband 09ba535d68 Merge with master 2016-12-09 10:17:55 -05:00
gaba 71d6b90993 SMall changes for PR. 2016-12-08 18:29:15 -10:00
gaba ecd3f5c347 IT removes duplicated code. 2016-12-08 18:19:00 -10:00
gaba a46ffe8ea6 It removes duplicated code. 2016-12-08 18:16:37 -10:00
gaba 9bfac3872e Moves banUser to users actions instead of comments actions. 2016-12-08 18:16:17 -10:00
gaba 0df1b9a498 Remove file that is not being used anymore. 2016-12-08 16:37:05 -10:00
gaba 1eb204f822 Merge branch 'master' into ban-user 2016-12-08 13:28:12 -10: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
gaba 953178a1e4 Adds a translation string in spanish. 2016-12-08 10:27:24 -10:00
Belen Curcio acbd465636 merge 2016-12-08 16:37:11 -03:00
Belen Curcio 59182e75d3 Translations 2016-12-08 16:32:39 -03:00
gaba 50afa3d190 Merge branch 'master' into ban-user 2016-12-08 09:22:22 -10:00
Belen Curcio 74e4771e17 new config 2016-12-08 16:21:07 -03:00
Belén Curcio 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
Dan Zajdband fb392422ea Added textarea for closed message on admin 2016-12-08 12:44:02 -05:00
gaba ec2b40fafe Missed a few actions when banned. 2016-12-07 16:49:55 -10:00
gaba 23c67b4a49 It fix the status change after merging master in. 2016-12-07 16:37:11 -10:00
gaba 0e2a7decd4 Adds ban/unban to cli. Fix ban user in the admin. 2016-12-07 14:55:49 -10:00
Riley Davis 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 1201196566 un-sneaking in some stuff 2016-12-06 15:51:22 -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 Davis f2c751f9f0 Merge branch 'master' into i18n-var 2016-12-06 13:41:44 -10:00
Belen Curcio e751d91794 typo 2016-12-06 14:21:02 -03:00
Belen Curcio 8036b4790d Notifications 2016-12-06 14:09:36 -03:00
Belen Curcio 623c32a002 Configure Stream Ready, Checkbox Coral UI 2016-12-06 12:18:29 -03:00
Belén Curcio 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 Gardner e528e0678f Merge branch 'master' into stream-e2e 2016-12-04 00:49:27 -05:00
gaba 3463e09cab Setting the showuserdialog in the reducer for comments. 2016-12-02 17:05:23 -08:00
gaba eb916099bd Merge 2016-12-02 16:52:16 -08:00
gaba 60d4793111 Adds a variable to the possible translations. 2016-12-02 16:12:24 -08:00
gaba 07e3a935ab Show the Dialog. 2016-12-02 16:03:19 -08:00
gaba d12693ae47 Adds a variable to the translation. 2016-12-02 16:02:50 -08:00
David Jay ead66520e2 Adjusting height of login button to match current comment. 2016-12-02 17:01:06 -05:00