Fix issue 2746 with position of inbox pagination #467
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shalott
added a commit
that referenced
this pull request
Feb 4, 2012
Fix issue 2746 with position of inbox pagination
shalott
added a commit
to shalott/otwarchive
that referenced
this pull request
Apr 27, 2012
commit 51916f0 Merge: 2111ace 1021025 Author: Elz <elzj78@gmail.com> Date: Wed Feb 15 21:03:14 2012 -0800 Merge pull request otwcode#478 from shalott/user_profile_fix_tweak only want to redirect rather than render when save successful commit 1021025 Author: shalott <shalott@gmail.com> Date: Wed Feb 15 23:56:22 2012 -0500 only want to redirect rather than render when save successful Signed-off-by: shalott <shalott@gmail.com> commit 2111ace Merge: 8bdc7e9 a89d6f8 Author: elz <elzj78@gmail.com> Date: Wed Feb 15 23:10:20 2012 -0500 Merge pull request otwcode#466 from shalott/otwarchive --- http://code.google.com/p/otwarchive/issues/detail?id=2883 Also sets up some improvements that can now be used to refactor how works/series/chapters handle pseuds (Pseudable module). commit 8bdc7e9 Merge: 3bffda6 6312b60 Author: Elz <elzj78@gmail.com> Date: Wed Feb 15 20:00:59 2012 -0800 Merge pull request otwcode#472 from sarken/issue_2843 Modify fix for issue 2843 by correcting tag, mystery, and WIP icons commit 3bffda6 Merge: 2ac88c1 0da9e1f Author: Elz <elzj78@gmail.com> Date: Wed Feb 15 20:00:31 2012 -0800 Merge pull request otwcode#470 from tuff-ghost/master 2674 + 2872: Add link to username in greeting; correct landmark in tags index commit 2ac88c1 Merge: b956e69 d0bc774 Author: Cristina <enigel@gmail.com> Date: Wed Feb 15 17:58:10 2012 -0800 Merge pull request otwcode#474 from elzj/issue-2731-weird-warnings Fixing issue 2731: tag set and challenge form tag problem Oh, how I've been wishing for this! \o/ commit d0bc774 Author: elz <elzj78@gmail.com> Date: Wed Feb 15 22:57:46 2012 +0000 Fixing issue 2731: don't display non-canonical ratings/warnings/categories on tag set and challenge forms. commit b956e69 Merge: 682d210 345de9c Author: Cristina <enigel@gmail.com> Date: Wed Feb 15 14:57:27 2012 -0800 Merge pull request otwcode#473 from elzj/issue-2806-activation-500 Fixing issue 2806: syntax error causing problems after activation. commit 682d210 Merge: e826659 5760aaa Author: Enigel <enigel@gmail.com> Date: Wed Feb 15 22:41:00 2012 +0000 Merge pull request otwcode#471 from elzj/otwarchive --- Fixing nil error in tag edit view and updating failing tests commit 345de9c Author: elz <elzj78@gmail.com> Date: Wed Feb 15 22:39:47 2012 +0000 Fixing issue 2806: syntax error causing problems after activation. commit 6312b60 Author: sarken <sarken@gmail.com> Date: Tue Feb 14 23:41:49 2012 +0000 Modify fix for issue 2843 by correcting tag, mystery, and WIP icons commit 5760aaa Author: elz <elzj78@gmail.com> Date: Tue Feb 14 23:09:14 2012 +0000 Fixing nil error in tag edit view and updating failing tests commit 0da9e1f Author: tuff_ghost <t.ghostersons@gmail.com> Date: Sat Feb 11 20:40:22 2012 +0000 Merge branches 'master' and '2872' commit 95d3e43 Author: tuff_ghost <t.ghostersons@gmail.com> Date: Sat Feb 11 20:34:57 2012 +0000 Correct landmark text on tags index commit a2918b7 Merge: 2e5dd90 e826659 Author: tuff_ghost <t.ghostersons@gmail.com> Date: Sat Feb 11 19:32:16 2012 +0000 Merge branch 'master' of git://github.com/otwcode/otwarchive commit 2e5dd90 Author: tuff_ghost <t.ghostersons@gmail.com> Date: Sat Feb 11 19:31:57 2012 +0000 Add link to username in greeting commit e826659 Author: Sidra <alice@alum.mit.edu> Date: Sat Feb 11 01:28:42 2012 +0000 rdoc update commit b39071e Merge: 6108453 494bd3e Author: shalott <shalott@gmail.com> Date: Sun Feb 5 18:04:41 2012 -0800 Merge pull request otwcode#469 from samjohnsson/ToS_FAQ_change_20120205 Clarification of ToS FAQ question: minimal ratings commit 6108453 Merge: 24804b9 462f645 Author: shalott <shalott@gmail.com> Date: Sun Feb 5 18:03:50 2012 -0800 Merge pull request otwcode#468 from sarken/issue_2882 Fix issue 2882 with profile page module having a shadow commit 24804b9 Merge: caf2a4b 540e1e8 Author: shalott <shalott@gmail.com> Date: Sun Feb 5 18:02:59 2012 -0800 Merge pull request otwcode#462 from ambtus/resque rake task to rerun resque failures commit 494bd3e Author: Sam Johnsson <samjohnsson@gmail.com> Date: Sun Feb 5 13:24:38 2012 -0600 Clarification of ToS FAQ question: minimal ratings commit 462f645 Author: sarken <sarken@gmail.com> Date: Sun Feb 5 10:45:14 2012 +0000 Fix issue 2882 with profile page module having a shadow commit caf2a4b Merge: 9f4557d 594674d Author: Elz <elzj78@gmail.com> Date: Sat Feb 4 08:09:32 2012 -0800 Merge pull request otwcode#458 from shalott/wrangling_ui_fixes Wrangling ui fixes commit 594674d Author: shalott <shalott@gmail.com> Date: Sat Feb 4 11:02:44 2012 -0500 adding comment for label method :) Signed-off-by: shalott <shalott@gmail.com> commit 9f4557d Merge: 50b2b9a 7d95d70 Author: shalott <shalott@gmail.com> Date: Sat Feb 4 07:46:25 2012 -0800 Merge pull request otwcode#467 from sarken/issue_2746 Fix issue 2746 with position of inbox pagination commit 7d95d70 Author: sarken <sarken@gmail.com> Date: Sat Feb 4 12:36:09 2012 +0000 Fix issue 2746 with position of inbox pagination commit 50b2b9a Merge: 6f1e949 a6cae28 Author: shalott <shalott@gmail.com> Date: Fri Feb 3 20:07:02 2012 -0800 Merge pull request otwcode#463 from ambtus/filter_tagging_partition making filter_tagging have a composite index commit 6f1e949 Merge: 271dd36 f90fa6c Author: shalott <shalott@gmail.com> Date: Fri Feb 3 20:04:51 2012 -0800 Merge pull request otwcode#465 from sarken/issue_2862 Fix issue 2862 by adding large class to new chapters textarea commit 271dd36 Merge: 1d93e7c cc2a53b Author: shalott <shalott@gmail.com> Date: Fri Feb 3 20:04:12 2012 -0800 Merge pull request otwcode#464 from sarken/issue_2857 Fix Issue 2857 with mobile style not matching screen commit a89d6f8 Author: shalott <shalott@gmail.com> Date: Fri Feb 3 22:38:05 2012 -0500 small wording tweak Signed-off-by: shalott <shalott@gmail.com> commit f90fa6c Author: sarken <sarken@gmail.com> Date: Sat Feb 4 02:44:53 2012 +0000 Fix issue 2862 by adding .large to new chapters textarea commit 542eacc Author: shalott <shalott@gmail.com> Date: Fri Feb 3 21:18:51 2012 -0500 autocomplete tweak for pseud autocomplete selects user's own pseuds when no argument passed to autocomplete Signed-off-by: shalott <shalott@gmail.com> commit 6e0c8d1 Author: shalott <shalott@gmail.com> Date: Fri Feb 3 21:17:54 2012 -0500 issue 2592: edit user profile renders instead of redirects Fix for http://code.google.com/p/otwarchive/issues/detail?id=2592 Signed-off-by: shalott <shalott@gmail.com> commit 58b278d Author: shalott <shalott@gmail.com> Date: Fri Feb 3 21:16:57 2012 -0500 edit multiple works Edit, delete, and orphan multiple works all now working. Signed-off-by: shalott <shalott@gmail.com> commit cc2a53b Author: sarken <sarken@gmail.com> Date: Sat Feb 4 01:38:27 2012 +0000 Fix Issue 2857 with mobile style not matching screen commit 1d93e7c Author: Sidra <alice@alum.mit.edu> Date: Sat Feb 4 01:28:44 2012 +0000 rdoc update commit a6cae28 Author: Sidra <alice@alum.mit.edu> Date: Fri Feb 3 16:05:01 2012 -0500 making filter_tagging have a composite index from james: around 22% improvement can be made by making the primary key include filter_id, additionally partitioning that table on filter_id helps the query by around 32%. I would recommend letting the system bed down for a week or so before we do the partitioning commit 540e1e8 Author: Sidra <alice@alum.mit.edu> Date: Fri Feb 3 14:37:33 2012 -0500 rake task to rerun resque failures also modified some of the other whenever schedules commit 2107241 Merge: 267b6fe d2b91f3 Author: shalott <shalott@gmail.com> Date: Fri Feb 3 07:25:05 2012 -0800 Merge pull request otwcode#461 from samjohnsson/2873 gcode 2873: add margin-top on .blurb stats commit d2b91f3 Author: Sam Johnsson <samjohnsson@gmail.com> Date: Thu Feb 2 20:06:48 2012 -0600 gcode 2873 margin on .blurb stats commit 267b6fe Merge: a388b65 7ea0b61 Author: shalott <shalott@gmail.com> Date: Thu Feb 2 17:25:15 2012 -0800 Merge pull request otwcode#460 from sarken/issue_2843 Fixed mixed-up rating icons for Issue 2843 commit 7ea0b61 Author: sarken <sarken@gmail.com> Date: Fri Feb 3 01:14:27 2012 +0000 Fixed mixed-up rating icons for Issue 2843 commit 48b65ae Merge: b7fccb5 a388b65 Author: shalott <shalott@gmail.com> Date: Thu Feb 2 19:56:34 2012 -0500 Merge branch 'refs/heads/master' into edit_multiple_works commit a388b65 Merge: 764bc92 8a81824 Author: shalott <shalott@gmail.com> Date: Thu Feb 2 16:56:03 2012 -0800 Merge pull request otwcode#459 from sarken/issue_2751 Fix issue 2751 with manage chapter input size commit 1e5a1a4 Merge: 0f38692 764bc92 Author: shalott <shalott@gmail.com> Date: Thu Feb 2 19:32:56 2012 -0500 Merge branch 'refs/heads/master' into wrangling_ui_fixes Conflicts: public/stylesheets/sandbox.css Signed-off-by: shalott <shalott@gmail.com> commit b7fccb5 Author: shalott <shalott@gmail.com> Date: Thu Feb 2 19:30:33 2012 -0500 fixes and improvements for batch editing works fix broken edit-multiple page, allow for mass-orphaning works, add options to change pseuds, collections, language, restriction level, and work skin. Signed-off-by: shalott <shalott@gmail.com> commit 8a81824 Author: sarken <sarken@gmail.com> Date: Thu Feb 2 21:23:21 2012 +0000 Removed unwanted width from ui-sortable input class commit 57e475d Author: sarken <sarken@gmail.com> Date: Thu Feb 2 21:14:16 2012 +0000 Modify fix for issue 2751 with manage chapters page by adding a class to the input commit 0f38692 Author: shalott <shalott@gmail.com> Date: Sun Jan 29 15:17:21 2012 -0500 cleaning up tags controller a bit more Signed-off-by: shalott <shalott@gmail.com> commit 46ceeb1 Merge: c2ca6de b11f26d Author: shalott <shalott@gmail.com> Date: Sun Jan 29 14:47:14 2012 -0500 Merge branch 'refs/heads/master' into wrangling_ui_fixes commit c2ca6de Author: shalott <shalott@gmail.com> Date: Sun Jan 29 14:46:12 2012 -0500 wrangling UI fixes Fixes issue 2234 and issue 2652 on the tag edit and wrangle pages. Also a bit of refactoring in the tags controller. Signed-off-by: shalott <shalott@gmail.com> commit 0a9a643 Merge: 0856bdb 80aedbc Author: shalott <shalott@gmail.com> Date: Fri Jan 27 21:44:07 2012 -0500 Merge branch 'refs/heads/master' into wrangling_ui_fixes commit 0856bdb Author: shalott <shalott@gmail.com> Date: Fri Dec 2 10:28:35 2011 -0500 tag edit page in progress Some variant approaches to doing the tag edit page Signed-off-by: shalott <shalott@gmail.com> commit ceb97e4 Author: shalott <shalott@gmail.com> Date: Wed Nov 30 10:26:08 2011 -0500 issue 2652: improvements to tag edit page Working on issue 2652: making tag removal into checkboxes Signed-off-by: shalott <shalott@gmail.com> Signed-off-by: shalott <shalott@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix issue 2746 with the bottom pagination on inbox pages appearing above the filters: http://code.google.com/p/otwarchive/issues/detail?id=2746