nilsding
|
90fe42e643
|
Merge remote-tracking branch 'origin/master' into moderation
Conflicts:
app/models/user.rb
|
2014-12-28 19:29:01 +01:00 |
|
nilsding
|
d79394640e
|
fixed GitHub issue #25
|
2014-12-28 00:34:56 +01:00 |
|
nilsding
|
3046a5e4b3
|
fixed tweet not tweeting
|
2014-12-27 21:03:18 +01:00 |
|
nilsding
|
a487ed7f69
|
update! raises an exception while update does not.
|
2014-12-27 17:37:54 +01:00 |
|
nilsding
|
b625144993
|
added moderation models
|
2014-12-27 14:35:09 +01:00 |
|
Andreas N
|
92af469aa4
|
Merge branch 'master' into moderation
|
2014-12-27 02:12:32 +01:00 |
|
nilsding
|
e570f40a36
|
WRYYYYYYYYYYYYYYYYYY
|
2014-12-27 01:45:24 +01:00 |
|
nilsding
|
88e9d7599d
|
dragons
|
2014-12-27 01:22:13 +01:00 |
|
nilsding
|
cb003ce36d
|
added link to moderation panel in navbar
|
2014-12-26 14:09:07 +01:00 |
|
nilsding
|
2251f21664
|
bio has now validation
|
2014-12-16 12:48:40 +01:00 |
|
nilsding
|
c0c279e6d8
|
closes GitHub issue #16
|
2014-12-14 21:35:24 +01:00 |
|
nilsding
|
a961764a56
|
closes github issue #15
|
2014-12-14 17:32:31 +01:00 |
|
nilsding
|
519931ee4f
|
fixed denotify
|
2014-12-14 15:48:10 +01:00 |
|
nilsding
|
622af3490c
|
added denotify method
|
2014-12-14 15:42:37 +01:00 |
|
nilsding
|
3eec44f422
|
Merge remote-tracking branches 'remotes/origin/master' and 'remotes/origin/users-smiled' into notifications
|
2014-12-14 15:29:32 +01:00 |
|
nilsding
|
43474a6c92
|
"commented on your answer"
|
2014-12-14 15:10:23 +01:00 |
|
nilsding
|
154c360e15
|
"smiled your answer"
|
2014-12-14 15:06:10 +01:00 |
|
nilsding
|
c9b5947e6b
|
"followed you"
|
2014-12-14 14:58:29 +01:00 |
|
nilsding
|
c56177cd10
|
we don't need this
|
2014-12-14 14:49:14 +01:00 |
|
nilsding
|
6a914d4394
|
added this thing
|
2014-12-14 14:44:25 +01:00 |
|
nilsding
|
ab9347f053
|
notifications work now!
|
2014-12-14 14:34:51 +01:00 |
|
nilsding
|
ec8e813546
|
bugfix
|
2014-12-14 13:31:26 +01:00 |
|
nilsding
|
ba31db68fe
|
Merge branch 'master' into notifications
|
2014-12-14 12:26:04 +01:00 |
|
nilsding
|
0ebf918d83
|
fixed this thing.
|
2014-12-14 12:19:52 +01:00 |
|
nilsding
|
82444b8787
|
bugfox!
|
2014-12-14 12:03:57 +01:00 |
|
nilsding
|
61a7b582e4
|
created notification model
|
2014-12-13 19:30:10 +01:00 |
|
nilsding
|
633e133713
|
sharing now works for real.
|
2014-12-13 15:38:16 +01:00 |
|
nilsding
|
b25c419e52
|
aw yeah
|
2014-12-12 23:53:23 +01:00 |
|
nilsding
|
5aab94207a
|
answer is now returned in Inbox#answer
|
2014-12-12 23:14:32 +01:00 |
|
nilsding
|
23fc3009fe
|
bugFuchs
|
2014-12-12 22:35:23 +01:00 |
|
nilsding
|
6d23ed5dcd
|
added service model
|
2014-12-12 21:42:34 +01:00 |
|
nilsding
|
130cbb27ce
|
Set a validation on :display_name
|
2014-12-12 18:52:56 +01:00 |
|
nilsding
|
e305a67d1e
|
255
|
2014-12-08 23:02:31 +01:00 |
|
nilsding
|
72c259bd0d
|
question#content now has a validation.
|
2014-12-08 15:34:37 +01:00 |
|
nilsding
|
7b5454a1bd
|
! (again)
|
2014-12-08 12:34:48 +01:00 |
|
nilsding
|
7de522a82f
|
added question#show thing and more...
|
2014-12-07 20:51:44 +01:00 |
|
nilsding
|
58d0efc219
|
implemented "ask your followers"
|
2014-12-07 20:13:45 +01:00 |
|
nilsding
|
2d44eeef60
|
added validation to comment
|
2014-12-07 14:29:47 +01:00 |
|
nilsding
|
8479f308ac
|
!
|
2014-12-07 14:29:35 +01:00 |
|
nilsding
|
d6111d6835
|
added User#comment
|
2014-12-05 14:11:08 +01:00 |
|
nilsding
|
b80d3c5bbd
|
removed website validation
|
2014-12-01 23:17:16 +01:00 |
|
nilsding
|
8b682bd52f
|
added website, bio and location fields to user
|
2014-12-01 20:47:10 +01:00 |
|
nilsding
|
97c197f112
|
smiles!!!
|
2014-11-30 20:31:22 +01:00 |
|
nilsding
|
027f2629b1
|
added smile model
|
2014-11-30 19:43:22 +01:00 |
|
nilsding
|
44cea60021
|
added validation for Comment model
|
2014-11-30 19:43:03 +01:00 |
|
nilsding
|
ae4952db28
|
deleting questions from the inbox is now possible
|
2014-11-30 18:05:51 +01:00 |
|
nilsding
|
e8974415c9
|
timeline now actually shows entries
|
2014-11-30 15:39:13 +01:00 |
|
nilsding
|
928addf5db
|
added methods for following/unfollowing users
|
2014-11-30 15:13:17 +01:00 |
|
nilsding
|
eecdecfda9
|
added validations and everything
|
2014-11-30 14:43:35 +01:00 |
|
nilsding
|
57c4578533
|
added relationship model
|
2014-11-30 14:06:05 +01:00 |