 Gabriela Rodríguez BerónandGitHub
|
1fefd3c8b4
|
Merge branch 'master' into wordlist
|
2016-12-09 10:26:39 -10:00 |
|
gaba
|
8b850a8d33
|
Fix the message.
|
2016-12-09 09:29:27 -10:00 |
|
gaba
|
d9b778fa74
|
A few translations for the spanish for this feature.
|
2016-12-09 09:19:08 -10:00 |
|
David Jay
|
bfe188eb5c
|
Cleaning up from merge.
|
2016-12-09 13:17:50 -05:00 |
|
David Jay
|
e032a5521e
|
Merge branch 'master' of github.com:coralproject/talk into wordlist
|
2016-12-09 13:05:11 -05: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 |
|
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 |
|
Belen Curcio
|
acbd465636
|
merge
|
2016-12-08 16:37:11 -03:00 |
|
Belen Curcio
|
59182e75d3
|
Translations
|
2016-12-08 16:32:39 -03:00 |
|
Belen Curcio
|
74e4771e17
|
new config
|
2016-12-08 16:21:07 -03: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 |
|
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 |
|
 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 |
|