5163 Commits

Author SHA1 Message Date
Elrond
7fd6f623f1 Merge remote branch 'upstream/master'
Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/media.html
2011-06-02 14:41:50 +02:00
Elrond
c849e69092 Check for edit permission.
You need to own the media, or be an admin to use the edit form.
As simple as that, for now.
2011-06-02 14:26:53 +02:00
Christopher Allan Webber
4d4b49a84e 0.0.2 of GNU MediaGoblin! 2011-05-31 19:54:26 -05:00
Christopher Allan Webber
155f24f9f5 If a user doesn't provide a userid and a token to the verify_email function, might as well 404 2011-05-31 19:37:28 -05:00
Christopher Allan Webber
73a1bc85f1 Moving import to outside of this function 2011-05-31 19:31:23 -05:00
Christopher Allan Webber
a72c504b25 Just adjusting some spacing so we don't go over 80 chars 2011-05-31 19:30:05 -05:00
Christopher Allan Webber
5866d1a8fb Give a "proper" view for resending verification email 2011-05-31 19:29:36 -05:00
Christopher Allan Webber
d9951a6e03 Merge remote branch 'remotes/aleks/aleks' 2011-05-31 19:17:28 -05:00
Aleksandar Micovic
b93a6a229e Added the ability to regenerate a verification key. 2011-05-31 17:14:23 -04:00
Aleksandar Micovic
bcec749b52 Fixed bug where someone who wasn't logged in was asked to verify
their emails.
2011-05-31 15:26:00 -04:00
Jef van Schendel
54f9d72356 Merge remote-tracking branch 'gitorious/master' 2011-05-31 14:32:46 +02:00
Aleksandar Micovic
28afb47ca8 Added a temporary verification page informing the user they need
to authenticate.
2011-05-30 23:51:30 -04:00
Christopher Allan Webber
b1ae76aea0 Add an index on MediaEntries making sure slugs + uploader combos are unique 2011-05-30 18:06:12 -05:00
Jef van Schendel
0d5094cb3b Improved object_gallery.html spacing 2011-05-31 00:45:42 +02:00
Christopher Allan Webber
8bfc87e18e Use the object gallery file on the front page also 2011-05-29 17:49:03 -05:00
Christopher Allan Webber
660e604824 This <ul /> not used (second inside), removing 2011-05-29 17:43:18 -05:00
Jakob Kramer
db5912e358 remove all 'username_repr' stuff 2011-05-29 19:49:25 +02:00
Jakob Kramer
ff6b9f7279 don't import 're' 2011-05-29 19:17:44 +02:00
Jakob Kramer
ce72a1bb15 this should fix #354 2011-05-29 19:15:46 +02:00
Jef van Schendel
dfd18edadc First changes to media gallery view 2011-05-29 02:02:26 +02:00
Jef van Schendel
d3060210bc Slightly modified text on media page 2011-05-29 01:53:41 +02:00
Jef van Schendel
37a0074826 Centered image on media page 2011-05-29 01:47:12 +02:00
Jef van Schendel
722d6a9705 Modified logo to change on :hover 2011-05-29 01:43:12 +02:00
Jef van Schendel
f0e621c8f5 Changed submit form to divs 2011-05-29 01:14:48 +02:00
Joar Wandborg
df901af738 Changed <p> font from 'sans' to 'sans-serif' 2011-05-28 23:56:29 +02:00
Joar Wandborg
00cc5cb745 Changed <body> font from 'sans' to 'sans-serif' 2011-05-28 23:54:15 +02:00
Joar Wandborg
a78c8af8a6 Merge branch 'master' of git://gitorious.org/~schendje/mediagoblin/schendjes-mediagoblin 2011-05-28 23:52:00 +02:00
Joar Wandborg
491dd3ff47 *GNU* MediaGoblin on <title> 2011-05-28 23:19:44 +02:00
Jef van Schendel
b5cc7afea2 Fixed submit button style, added create-account notice to log in page 2011-05-28 21:32:12 +02:00
Jef van Schendel
7c2005b6e2 Forgot a bottom-margin for the error div 2011-05-28 21:15:15 +02:00
Jef van Schendel
b0ff25c82c Changed login forms to use divs instead of tables 2011-05-28 21:10:54 +02:00
Jef van Schendel
716a0ac3f1 Styled error messages 2011-05-28 21:02:34 +02:00
Jef van Schendel
9ef7c0f737 Fixed form header 2011-05-28 20:43:57 +02:00
Jef van Schendel
491b9109f3 Styled forms 2011-05-28 18:32:43 +02:00
Jef van Schendel
ead3ebd6b7 Merge remote-tracking branch 'gitorious/master' 2011-05-28 17:44:15 +02:00
Christopher Allan Webber
8566cdda71 Added a new form rendering system, render_divs, and using it for registration 2011-05-28 09:54:09 -05:00
Elrond
98857207cc "edit": Finally implement saving.
Currently no checks. Probably not so good.
And especially, every logged in user currently can edit the
data for any other user's media.
2011-05-27 00:17:30 +02:00
Elrond
8782001bf0 Use new button style 2011-05-26 23:17:41 +02:00
Elrond
aba81c9f20 Starting "edit" functionality.
This adds a link to the "edit" form, the form, the view for
displaying the form and that's about it.
2011-05-26 23:09:33 +02:00
Jef van Schendel
c7da9c973f Merge remote-tracking branch 'gitorious/master' 2011-05-26 19:27:58 +02:00
Christopher Allan Webber
e698dedad5 *GNU* MediaGoblin home ;) 2011-05-26 10:14:46 -05:00
Jef van Schendel
04d7c55fc6 Changed logout/account text 2011-05-26 01:24:13 +02:00
Jef van Schendel
3f139dd259 Changed header size 2011-05-26 00:45:17 +02:00
Jef van Schendel
4fdd102175 We now have only one button style 2011-05-26 00:41:13 +02:00
Jef van Schendel
38aa4a4026 Put log in / log out in its place! 2011-05-26 00:15:26 +02:00
Jef van Schendel
207219b561 Changed mediagoblin_content name to mediagoblin_container 2011-05-26 00:12:23 +02:00
Jef van Schendel
d89d1bb945 Added actual image 2011-05-26 00:05:08 +02:00
Jef van Schendel
2f4d0584d1 Added header icon link 2011-05-26 00:04:40 +02:00
Jef van Schendel
e83f8b3c19 Removed clever subtitle 2011-05-25 23:57:51 +02:00
Jef van Schendel
7e199c9c87 Changed link color and underline 2011-05-23 17:39:58 -05:00