maxwell
|
650a502404
|
MS IZ removed a bunch of unused request stuff
|
2010-09-13 16:58:23 -07:00 |
|
maxwell
|
63b3513a12
|
MS IZ removed the links to the requests index
|
2010-09-13 16:53:33 -07:00 |
|
maxwell
|
3b1223c9dd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 15:48:50 -07:00 |
|
maxwell
|
6f75a81a9d
|
IZ MS trying again on fixing remote profile images
|
2010-09-13 15:48:30 -07:00 |
|
Daniel Vincent Grippi
|
26e4e088d7
|
flash messages are now being set.
|
2010-09-13 15:44:26 -07:00 |
|
Daniel Vincent Grippi
|
0e5ef9e005
|
more informative 400 and 500 pages
|
2010-09-13 15:24:15 -07:00 |
|
Raphael
|
35a4e0aaa1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 15:21:38 -07:00 |
|
Raphael
|
ff348eb944
|
Add flashes back in to aspect and albums
|
2010-09-13 15:20:57 -07:00 |
|
Daniel Vincent Grippi
|
48403996f0
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 15:11:38 -07:00 |
|
Daniel Vincent Grippi
|
2fae1049d9
|
silent comments in all views except the layout and session wall
|
2010-09-13 15:11:14 -07:00 |
|
maxwell
|
a7231d041e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 15:09:20 -07:00 |
|
maxwell
|
c098be99bc
|
MS IZ attempt one to fix remote profile images
|
2010-09-13 15:08:39 -07:00 |
|
Raphael
|
34a4804b9f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 14:49:01 -07:00 |
|
Raphael
|
fd31e9aeeb
|
Force downcase on usernames
|
2010-09-13 14:48:55 -07:00 |
|
Daniel Vincent Grippi
|
94765906e0
|
forgot licenses on javascript files.
|
2010-09-13 14:43:24 -07:00 |
|
Daniel Vincent Grippi
|
a87925b359
|
missing license on layout
|
2010-09-13 14:39:18 -07:00 |
|
Daniel Vincent Grippi
|
40ecf176e8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 14:26:15 -07:00 |
|
Daniel Vincent Grippi
|
4c15b1a01c
|
added license to every single goddamn file. also, put one in the root dir.
|
2010-09-13 14:23:50 -07:00 |
|
maxwell
|
0b33e6b3eb
|
MS IZ album page is now not completely wonky, but still kind of pointless...
|
2010-09-13 14:23:38 -07:00 |
|
maxwell
|
a9b64232df
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 12:21:04 -07:00 |
|
maxwell
|
24d957cb32
|
MS IZ removed the views and redirected the edit route
|
2010-09-13 12:20:47 -07:00 |
|
Raphael
|
f6b6720349
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 12:16:49 -07:00 |
|
Raphael
|
b05d106aed
|
Remove user_refs from Person, put pendings in the broken photo specs
|
2010-09-13 12:16:43 -07:00 |
|
maxwell
|
27f1b29581
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 11:54:50 -07:00 |
|
maxwell
|
812f2550aa
|
removed status message webfinger link
|
2010-09-13 11:52:47 -07:00 |
|
Daniel Vincent Grippi
|
3be86c2b5c
|
fixed tab bug in ff
|
2010-09-13 11:51:25 -07:00 |
|
Daniel Vincent Grippi
|
3c893454e9
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 11:43:00 -07:00 |
|
Daniel Vincent Grippi
|
6aeaea1b7d
|
removed some things. also, comment buttons are now css-ified when they come through the socket
|
2010-09-13 11:42:41 -07:00 |
|
Raphael
|
e33d6d8123
|
Don't create 500s on comment posting
|
2010-09-13 11:30:10 -07:00 |
|
Daniel Vincent Grippi
|
200b0045f7
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
public/stylesheets/application.css
public/stylesheets/sass/application.sass
|
2010-09-13 11:22:05 -07:00 |
|
Daniel Vincent Grippi
|
8c80174e73
|
removed some unneeded sass
|
2010-09-13 11:16:59 -07:00 |
|
Raphael
|
1312728b88
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
public/stylesheets/application.css
public/stylesheets/sass/application.sass
|
2010-09-13 11:16:45 -07:00 |
|
Raphael
|
aa0a00d9cb
|
Finish moving to aspects, DB reset required
|
2010-09-13 11:15:08 -07:00 |
|
ilya
|
92ccd3c21e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 11:09:28 -07:00 |
|
ilya
|
434557749a
|
changed selenium slightly
|
2010-09-13 11:09:02 -07:00 |
|
Daniel Vincent Grippi
|
7579c0ec50
|
more cleanup
|
2010-09-13 11:05:10 -07:00 |
|
Daniel Vincent Grippi
|
f5565025cb
|
removed glyphish icons
|
2010-09-13 10:44:20 -07:00 |
|
Raphael
|
9837340eb2
|
Rename files from group to aspect
|
2010-09-13 10:43:15 -07:00 |
|
Daniel Vincent Grippi
|
a74e00c159
|
removed hover user menu
|
2010-09-13 10:40:09 -07:00 |
|
Raphael
|
44a1f82da9
|
Rename group to aspect
|
2010-09-13 10:38:38 -07:00 |
|
Daniel Vincent Grippi
|
ede03fe1d5
|
added graident back into firefox
|
2010-09-13 10:23:24 -07:00 |
|
ilya
|
3014c4d057
|
silly little thing
|
2010-09-12 23:22:20 -07:00 |
|
ilya
|
a738807cf4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-12 22:56:29 -07:00 |
|
ilya
|
0896efa5d6
|
now requests are called requested people, same css but less hacky selection
|
2010-09-12 22:54:53 -07:00 |
|
Daniel Vincent Grippi
|
897074c869
|
replace in comment websocket action replaces one or more number instead of just the first
|
2010-09-12 22:33:51 -07:00 |
|
Daniel Vincent Grippi
|
c133233155
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-12 22:17:48 -07:00 |
|
Daniel Vincent Grippi
|
4bf8bc9c0b
|
wrong key being sent in recieve method for posts (group_id => group_ids)
|
2010-09-12 22:17:39 -07:00 |
|
ilya
|
2800f9351c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-12 22:14:44 -07:00 |
|
Daniel Vincent Grippi
|
945a6ffbeb
|
added a logger in post
|
2010-09-12 22:11:01 -07:00 |
|
ilya
|
3bd686143f
|
need to send it without data
|
2010-09-12 22:10:50 -07:00 |
|