heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,170 Commits 1 Branch 0 Tags
Commit Graph

4170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aditi
dc56835a79 Add function get_all_blog_posts_of_blog. 2013-08-29 10:35:53 +05:30
Aditi
b0802bc3b2 Resolve merge conflict. 2013-08-29 10:34:47 +05:30
Aditi
0b2ea4bb4f Refactor views using functions in lib file. 2013-08-28 23:42:35 +05:30
Aditi
3a971ef736 Change Url for blog post listing view. 2013-08-28 23:32:13 +05:30
Aditi
922599990d Pull changes and resolve merge conflict. 2013-08-28 23:28:09 +05:30
Christopher Allan Webber
b33feb18a7 Fix failing to build docs 2013-08-28 11:11:41 -05:00
Christopher Allan Webber
9dfca6b3ce double colon here was killing the build 2013-08-28 11:06:07 -05:00
Christopher Allan Webber
7904402750 Should fix Beuc's bug with video thumbnail width... I think! 2013-08-28 09:15:47 -05:00
Rodney Ewing
a126ef4d89 0.5.0 release notes 2013-08-27 14:24:24 -07:00
Christopher Allan Webber
fea0e4e4ea Committing extracted and compiled translations 2013-08-26 17:39:53 -05:00
Christopher Allan Webber
85572ade58 Committing present MediaGoblin translations before pushing extracted messages 2013-08-26 17:38:50 -05:00
Christopher Allan Webber
1847a482c1 Fixing another typo, thanks to Laura Arjona (again!) 2013-08-26 17:35:54 -05:00
Christopher Allan Webber
6db375b522 Fixing typo. Thanks larjona! 2013-08-26 17:28:51 -05:00
Christopher Allan Webber
3b8251f329 Switch docs back over to using old virtualenv setup while we resolve issue #755 2013-08-26 15:50:47 -05:00
Christopher Allan Webber
567c09f02c Committing extracted and compiled translations 2013-08-26 14:19:44 -05:00
Christopher Allan Webber
3bc2bb1bc7 Committing present MediaGoblin translations before pushing extracted messages 2013-08-26 14:18:04 -05:00
Christopher Allan Webber
e9e57e144e transifex.net->transifex.com 2013-08-26 14:17:34 -05:00
Rodney Ewing
0b95003cd4 use media.get_uploader and fix typo 2013-08-26 06:33:30 -07:00
Rodney Ewing
2188925bab javascript limit validation 2013-08-26 06:33:30 -07:00
Rodney Ewing
a80ea74702 fix after rebase 2013-08-26 06:33:30 -07:00
Rodney Ewing
e1ad18cc6d duplicate 2013-08-26 06:33:30 -07:00
Rodney Ewing
7707172e39 copying.txt 2013-08-26 06:33:30 -07:00
Rodney Ewing
53cf5b4556 added tests 2013-08-26 06:33:30 -07:00
Rodney Ewing
1cb84a3632 fixed tests and defaults 2013-08-26 06:33:30 -07:00
Rodney Ewing
ecb4512822 max file size 2013-08-26 06:33:30 -07:00
Rodney Ewing
2f74de492e fixed tests 2013-08-26 06:33:30 -07:00
Rodney Ewing
cc4457f407 fixed tests and defaults 2013-08-26 06:33:29 -07:00
Rodney Ewing
001a50a850 fixed tests and defaults 2013-08-26 06:33:29 -07:00
Rodney Ewing
91a52878cf made no upload limit the default 2013-08-26 06:33:29 -07:00
Rodney Ewing
150bee3f8f typos 2013-08-26 06:33:28 -07:00
Rodney Ewing
c3cce7564a added tests 2013-08-26 06:33:28 -07:00
Rodney Ewing
bdd2242155 added user upload limits 2013-08-26 06:33:28 -07:00
Christopher Allan Webber
7b12cbd98b Removing unnecessary "setup_plugin()" calls, as pointed out by Velmont. 2013-08-25 13:59:34 -05:00
Christopher Allan Webber
6c3d383bbb Merge remote-tracking branch 'refs/remotes/rodney757/email' 2013-08-25 13:23:27 -05:00
Aditi
7d9dbe32cc Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin 2013-08-25 09:24:13 +05:30
tilly-Q
e46fb71c1d pushing so paroneayea can help me resolve a conflict within the tests. 2013-08-23 16:14:36 -04:00
Christopher Allan Webber
e8eec575f3 Not sure why there wasn't a .commit() at the end of add_new_notification_tables() 
... but it seems like there should be and it wouldn't hurt.

This commit sponsored by Julio Claudio Matus Ramirez.  Thank you!
 2013-08-22 16:04:19 -05:00
Aditi
70cc6eb8f3 Resolve merge conflict and merge. 2013-08-22 22:34:06 +05:30
Rodney Ewing
fd9e4af272 skip ascii thumb resizing if necessary 2013-08-21 16:03:34 -07:00
Rodney Ewing
e2b5634549 skip image resizing if possible 2013-08-21 14:44:18 -07:00
Rodney Ewing
e002452f91 get and set metadata for a MediaFile 2013-08-21 14:44:13 -07:00
Christopher Allan Webber
2c79dbc5ff Merge remote-tracking branch 'refs/remotes/rodney757/notifications' 2013-08-21 16:00:48 -05:00
Rodney Ewing
0cdebda7fc only use the width for video thumbnails to keep the correct scaling 2013-08-21 12:38:12 -07:00
Christopher Allan Webber
f397ef118f Fixing migration name. webm not wemb :) 2013-08-21 14:19:11 -05:00
Christopher Allan Webber
f6497ce572 Merge remote-tracking branch 'refs/remotes/rodney757/reprocessing' 
Conflicts:
	mediagoblin/processing/task.py
	mediagoblin/submit/lib.py
 2013-08-21 12:39:38 -05:00
tilly-Q
2c901db023 This commit was just to fix a few of the errors with the merging and to 
make sure that all of the previous tests work fine.
 2013-08-20 15:24:29 -04:00
Rodney Ewing
9de4fab437 rename webm_640 to webm_video since it might be a different resolution 2013-08-20 10:29:38 -07:00
tilly-Q
9e204e49c9 Merge branch 'master' into OPW-Moderation-Update 
Conflicts:
	mediagoblin/db/models.py
	mediagoblin/decorators.py
	mediagoblin/routing.py
	mediagoblin/user_pages/views.py
 2013-08-20 12:21:13 -04:00
tilly-Q
e1561d0488 This was a very small update, I'm hoping to rebase after this to solve some 
other problems. I started looking at the tests in this update. This update I
spent fixing the tests to work with my new code.

--\ mediagoblin/db/migration_tools.py
--| Merging from ticket 679

--\ mediagoblin/db/migrations.py
--| Added unique constraint to Privilege.privilege_name

--\ mediagoblin/db/models.py
--| Deleted vestigial Privilege.is_admin_or_moderator method

--\ mediagoblin/templates/mediagoblin/moderation/user.html
--| Add a `Ban User` / `UnBan User` for admin

--\ mediagoblin/test/test_api.py
--| Fixed test with my new changes

--\ mediagoblin/test/test_auth.py
--| Try to fix test, still having problems

--\ mediagoblin/test/test_modelmethods.py
--| Wrote my first test for the User.has_privilege method

--\ mediagoblin/test/test_modelmethods.py
--| Fixed test with my new changes

--\ mediagoblin/test/test_sqlmigrations.py
--| Merging from ticket 679

--\ mediagoblin/test/tools.py
--| Editted add_fixture_user to allow for privileges rather than active column
 2013-08-20 12:02:20 -04:00
Rodney Ewing
c9f9536cdf move links to the bottom of the page until we have a tabbed UI 2013-08-20 08:25:45 -07:00