Commit Graph

153 Commits

Author SHA1 Message Date
nilsding eaa4096af5 Merge branch 'master' into groups
Conflicts:
	db/schema.rb
2015-01-13 07:05:11 +01:00
nilsding d1a6c512c4 finally corrected that model thing. 2015-01-12 06:41:44 +01:00
nilsding 5e26d72d91 finally commited the stuff I wrote 4 hours ago 2015-01-10 23:29:04 +01:00
nilsding 6fcbee55c4 added forbidden user names (including case insensitivity!) 2015-01-09 14:12:52 +01:00
nilsding ce7f896e0c added Group model 2015-01-08 13:16:13 +01:00
nilsding 3567ba6190 numbers 2015-01-05 10:16:00 +01:00
nilsding 496ff61a65 added User#answered? 2015-01-03 18:40:56 +01:00
nilsding 8aee9bd69e added User#answer, moved some code from inbox.rb to answer.rb 2015-01-03 18:09:56 +01:00
nilsding e9ab8deb85 :async 2015-01-01 18:17:34 +01:00
nilsding 149868c097 this should do. 2015-01-01 18:08:16 +01:00
nilsding 5df705cdaa argh 2015-01-01 17:59:24 +01:00
nilsding dee2ba253e fix this shit 2015-01-01 17:54:16 +01:00
nilsding 7aa954e212 added cropper processor 2014-12-29 14:51:52 +01:00
nilsding b378a03afa added delayed_paperclip 2014-12-29 11:58:01 +01:00
nilsding cf3933271a added profile_picture to users 2014-12-29 10:18:12 +01:00
nilsding a0c0d68e43 posting moderation comments works now 2014-12-29 00:50:14 +01:00
nilsding 486d5d18f2 this fucker finally works how I want it to 2014-12-28 23:57:07 +01:00
nilsding 7a0b3f4af7 added votes for reports 2014-12-28 23:26:16 +01:00
nilsding 40f54fd19a more before_destroy and after_create 2014-12-28 21:58:35 +01:00
nilsding bb3e431393 added associations for this 2014-12-28 21:47:51 +01:00
nilsding 2c29dd9a18 even more after_create and before_destroy 2014-12-28 21:46:57 +01:00
nilsding 9c9c4fdc5d after_create and before_destroy 2014-12-28 21:40:33 +01:00
nilsding 774cf8df99 h 2014-12-28 19:32:08 +01:00
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 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 622af3490c added denotify method 2014-12-14 15:42:37 +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 ab9347f053 notifications work now! 2014-12-14 14:34:51 +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 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 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 fb48c6d995 finally, setting the display_name works. 2014-11-11 20:20:00 +01:00
nilsding 17db50623a added inbox model 2014-11-10 23:46:02 +01:00
nilsding ae66877cde changed a few things 2014-10-28 06:36:38 +01:00
nilsding 7641726677 added authentication and everything 2014-08-01 15:27:08 +02:00
nilsding b45be30b19 added users model 2014-08-01 12:07:16 +02:00