Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Fix copyright header on FavoritesController to list correct copyright ↵ | Johan Sørensen | 2009-12-07 | 1 | -6/+1 | |
| | | | | holders of the content | |||||
* | Sort watched by recency in the ~user lists | Johan Sørensen | 2009-12-07 | 2 | -14/+20 | |
| | ||||||
* | The default events are @user#events, owner can view watched events too | Marius Mathiesen | 2009-12-07 | 1 | -2/+2 | |
| | ||||||
* | Passing parameters to pagination of events saves a few conditionals in ↵ | Marius Mathiesen | 2009-12-07 | 2 | -3/+3 | |
| | | | | | | UsersController - Will_paginate discards empty :params, letting us specify custom URL parameters where applicable (for pagination) | |||||
* | Show a message when user haven't favorited anything | Johan Sørensen | 2009-12-07 | 2 | -5/+23 | |
| | ||||||
* | Fixed 1.8 syntax error in UserTest | Johan Sørensen | 2009-12-07 | 2 | -82/+93 | |
| | ||||||
* | Link to the user from a message and cut some long lines | Johan Sørensen | 2009-12-07 | 1 | -9/+17 | |
| | ||||||
* | Handle pagination clicks from ajax rendered events by redirecting to Users#show | Marius Mathiesen | 2009-12-03 | 1 | -13/+30 | |
| | | | | - Users#show now accepts ?events=watched for current user, which will render with these activitites | |||||
* | Caching the current activity selection | Marius Mathiesen | 2009-12-03 | 1 | -5/+14 | |
| | ||||||
* | Include user favorites in Users#show | Marius Mathiesen | 2009-12-03 | 6 | -8/+143 | |
| | | | | - Let the user toggle between his own activities and what he's watching on his own page | |||||
* | Moved the favorite linking to a separate module | Marius Mathiesen | 2009-12-03 | 3 | -9/+41 | |
| | ||||||
* | Add an event when someone starts watching a repository. | Marius Mathiesen | 2009-12-03 | 6 | -0/+47 | |
| | | | | - Added rendering of favorite related events | |||||
* | Favorites: GUI improvements, rename user accessor to events | Marius Mathiesen | 2009-12-03 | 8 | -11/+47 | |
| | | | | | - Added waiting indicator when favoriting, added CSS classes - Renamed User#favorite_events -> User#events_in_watchlist | |||||
* | Access to a user's favorite events | Marius Mathiesen | 2009-12-03 | 5 | -14/+44 | |
| | | | | Removed old copyrights. | |||||
* | Giving test coverage to link helper | Marius Mathiesen | 2009-12-03 | 2 | -29/+77 | |
| | ||||||
* | Moving the form replacer into a testable jQuery plugin | Marius Mathiesen | 2009-12-03 | 3 | -33/+69 | |
| | ||||||
* | Hook into the create/delete actions for watching with some Ajax goodness | Marius Mathiesen | 2009-12-03 | 4 | -8/+58 | |
| | | | | | | - Add a custom attr to the a tags - Replace the obtrusive Rails actions with some homebrew - Favorites#{create,destroy} now supplies a Location header intercepted by javascript | |||||
* | Adding Favorites#destroy, set flash, add link to (un)favorite repository | Marius Mathiesen | 2009-12-03 | 5 | -2/+61 | |
| | ||||||
* | FavoritesController: provides watching of repositories | Marius Mathiesen | 2009-12-03 | 6 | -0/+179 | |
| | | | | - Also added Copyright header where missing | |||||
* | Improve the favorite/favoritable model: | Marius Mathiesen | 2009-12-03 | 6 | -3/+63 | |
| | | | | | - Validations - Extract watchable logic into module | |||||
* | Adding basic favorite model | Marius Mathiesen | 2009-12-03 | 5 | -1/+50 | |
| | ||||||
* | Add back the team memberships list to the ~user page | Johan Sørensen | 2009-12-03 | 1 | -1/+15 | |
| | ||||||
* | Tiny bit more contrast on the pull-box headers | Johan Sørensen | 2009-12-03 | 1 | -1/+1 | |
| | ||||||
* | Whitespace shenenigans in group.rb | Johan Sørensen | 2009-12-03 | 1 | -29/+29 | |
| | ||||||
* | Only include groups user is an admin for list of teams a user can transfer a ↵ | Johan Sørensen | 2009-12-03 | 2 | -113/+122 | |
| | | | | project to | |||||
* | Slightly wider activity box (#left) on the ~user page | Johan Sørensen | 2009-12-03 | 1 | -1/+4 | |
| | ||||||
* | Skip the shadow on white buttons all together | Johan Sørensen | 2009-12-03 | 2 | -6/+1 | |
| | ||||||
* | Introduce and use a white_button_link_to() helper and buttonify the user ↵ | Johan Sørensen | 2009-12-03 | 6 | -61/+78 | |
| | | | | profile links | |||||
* | No background image on .pull-box.expose | Johan Sørensen | 2009-12-02 | 2 | -0/+1 | |
| | ||||||
* | Use the silver fade on all pull boxes | Johan Sørensen | 2009-12-02 | 1 | -12/+7 | |
| | ||||||
* | Greet the user on Site#index instead of the same old message | Johan Sørensen | 2009-12-02 | 3 | -27/+23 | |
| | ||||||
* | Add a footer to the notification_copy email that you shouldn't reply via email | Johan Sørensen | 2009-12-02 | 2 | -3/+7 | |
| | ||||||
* | Skip the margin-left on the .details unordered list | Johan Sørensen | 2009-12-01 | 1 | -4/+5 | |
| | ||||||
* | Further restructuring of the ~user page and some color tweaks | Johan Sørensen | 2009-12-01 | 6 | -7/+26 | |
| | ||||||
* | Add a tally of merge requests the user may wish to look at on his ~user page | Johan Sørensen | 2009-12-01 | 7 | -180/+259 | |
| | | | | Also try out some restructuring of the ~user page | |||||
* | don't overwrite the current license when editing a project | Johan Sørensen | 2009-12-01 | 1 | -2/+4 | |
| | ||||||
* | attr_protect Committership#permisssions from mass attribute updates | Johan Sørensen | 2009-11-30 | 5 | -47/+46 | |
| | | | | | | Also ad a Committership::create_with_permission to easy expressing things, mostly for usable for test and utility code NOT for controller code. | |||||
* | Simplify the show_clone_list_search?() helper | Johan Sørensen | 2009-11-30 | 1 | -2/+1 | |
| | ||||||
* | Don't just assume committership when deciding when to show the "request ↵ | Johan Sørensen | 2009-11-30 | 4 | -5/+23 | |
| | | | | | | | merge" link Requesting a merge from one mainline to another doens't make sense, since they don't have any parents | |||||
* | change wording of "Aliases" to "Email Aliases" | Johan Sørensen | 2009-11-30 | 1 | -4/+4 | |
| | ||||||
* | Pedantic line-length and whitespace cleanup | Johan Sørensen | 2009-11-30 | 1 | -13/+18 | |
| | ||||||
* | Fixed 1.8 syntax error in the MergeRequestProcessorTest | Johan Sørensen | 2009-11-30 | 2 | -12/+11 | |
| | ||||||
* | Make the index on sequence number unique for each target_repository_id | Marius Mathiesen | 2009-11-30 | 1 | -1/+1 | |
| | ||||||
* | Removing obsolete, commented code | Marius Mathiesen | 2009-11-30 | 1 | -14/+0 | |
| | ||||||
* | Of course, the MergeRequestProcessor needs and expects Merge requests by id, ↵ | Marius Mathiesen | 2009-11-30 | 2 | -5/+6 | |
| | | | | not sequence number | |||||
* | Load the correct merge request in various scenarios | Marius Mathiesen | 2009-11-30 | 6 | -19/+7 | |
| | | | | | | | - Repositories#config scopes merge requests on repository - MergeRequestProcessor looks up by sequence number, not id - PushEventProcessor finds merge request in repo, not directly by sequence_number - MergeRequests#show use to_param in title | |||||
* | MergeRequest's to_param now uses the sequence number instead of id | Marius Mathiesen | 2009-11-30 | 11 | -49/+72 | |
| | | | | | | | | | | A summary of what's changed: - Routing - Links, where necessary - Git branch names use seq instead of id Also made some refactorings in PushEventProcessor to make it testable without a full stack test. And set some revealing sequence numbers in the fixtures. | |||||
* | Adding an index for sequence numbers in merge request | Marius Mathiesen | 2009-11-30 | 3 | -2/+12 | |
| | ||||||
* | Avoiding ridiculously high sequence numbers | Marius Mathiesen | 2009-11-30 | 3 | -14/+47 | |
| | | | | | - Try to represent the # of merge requests in a repo in the sequence number - If this sequence is taken, build on the highest existing one until this is surpassed | |||||
* | Merge request sequences should be unique for each target repository | Marius Mathiesen | 2009-11-30 | 1 | -2/+15 | |
| | ||||||
* | Adding sequence number to merge requests, will replace id in URLs etc. | Marius Mathiesen | 2009-11-30 | 7 | -9/+90 | |
| | ||||||
* | Make it more obvious that the new message notifications are just that | Johan Sørensen | 2009-11-30 | 3 | -22/+23 | |
| | | | | | The outgoing email notification when receiving a private message should be a lot clearer that it is a message | |||||
* | Updated Rails to the v.2.3.5 tag | Johan Sørensen | 2009-11-27 | 328 | -3319/+5958 | |
| | ||||||
* | Don't rely on hash sort ordering | Johan Sørensen | 2009-11-27 | 1 | -1/+1 | |
| | ||||||
* | Don't blow up if Committership#build_permissions receives nil | Johan Sørensen | 2009-11-26 | 2 | -1/+6 | |
| | ||||||
* | Make sure the Comment tests relating to notifications start on a clean slate | Johan Sørensen | 2009-11-26 | 1 | -0/+1 | |
| | ||||||
* | Be able to edit permissions on a committership | Johan Sørensen | 2009-11-26 | 4 | -1/+113 | |
| | ||||||
* | Merge commit 'refs/merge-requests/2202' of ↵ | Johan Sørensen | 2009-11-26 | 2 | -2/+5 | |
|\ | | | | | | | | | | | | | git://gitorious.org/gitorious/mainline * git://gitorious.org/gitorious/mainline: default_license option in config. | |||||
| * | default_license option in config. | Tom Adams | 2009-11-23 | 2 | -2/+5 | |
| | | ||||||
* | | Set the Memberships breadcrump as the parent of NewMembership | Johan Sørensen | 2009-11-26 | 1 | -1/+1 | |
| | | ||||||
* | | Merge commit 'refs/merge-requests/2179' of ↵ | Johan Sørensen | 2009-11-26 | 6 | -1/+47 | |
|\ \ | | | | | | | | | | | | | | | | | | | git://gitorious.org/gitorious/mainline * git://gitorious.org/gitorious/mainline: Add missing breadcrumbs for new and edit memberships. | |||||
| * | | Add missing breadcrumbs for new and edit memberships. | Thomas Schamm | 2009-11-23 | 6 | -1/+47 | |
| |/ | ||||||
* | | Only show public emails on the memberships page | Johan Sørensen | 2009-11-25 | 1 | -3/+3 | |
| | | ||||||
* | | Make sure the add/remove colalborator events doesn't mention the deprecated ↵ | Johan Sørensen | 2009-11-25 | 2 | -59/+59 | |
| | | | | | | | | term committer | |||||
* | | Fix the line-height on the event commit messages | Johan Sørensen | 2009-11-25 | 1 | -0/+1 | |
| | | ||||||
* | | Hint the database to use the proper index in Event::latest | Johan Sørensen | 2009-11-25 | 1 | -17/+25 | |
| | | ||||||
* | | Use a smaller time window for calculating most active clones | Johan Sørensen | 2009-11-25 | 1 | -3/+3 | |
| | | ||||||
* | | Remove the "repo can't be deleted if it's the last mainline" check | Johan Sørensen | 2009-11-24 | 2 | -12/+1 | |
| | | | | | | | | In practice its function is a bit counter-intuitive and not really useful | |||||
* | | Use Repository#admin? instead if repo.owner.admin? to query for adminship | Johan Sørensen | 2009-11-24 | 7 | -133/+182 | |
| | | | | | | | | | | That way we use the collaborator permissions instead of just the owner, which is inline with how the new permission scheme works | |||||
* | | Added Repository#{admin,reviewer,committer}? helpers and fixup ↵ | Johan Sørensen | 2009-11-24 | 2 | -12/+83 | |
| | | | | | | | | | | | | can_be_deleted_by? The can_be_deleted_by? method now takes the proper adminship (through the committerships) into account | |||||
* | | Speed the AddPermissionsToCommitterships migration up | Johan Sørensen | 2009-11-24 | 2 | -12/+1 | |
| | | ||||||
* | | No reason to skip bits in the Committership permissions | Johan Sørensen | 2009-11-24 | 1 | -2/+2 | |
| | | ||||||
* | | Add sanity-check assertion | Johan Sørensen | 2009-11-24 | 1 | -0/+1 | |
| | | ||||||
* | | Add some textual explanations of the different permissions | Johan Sørensen | 2009-11-23 | 4 | -0/+62 | |
| | | ||||||
* | | Wording tweaks on the add collaborator page | Johan Sørensen | 2009-11-23 | 2 | -2/+3 | |
|/ | ||||||
* | Updated the add_permissions_to_committerships migration to set proper base ↵ | Johan Sørensen | 2009-11-19 | 2 | -2/+12 | |
| | | | | permissions | |||||
* | Use "Collaborator" instead of "Committer" when adding new committerships | Johan Sørensen | 2009-11-19 | 8 | -91/+143 | |
| | | | | | The Committership class really needs a different name now that they have more fine-grained permissions, but now just change the UI. | |||||
* | Only notify reviewers about new merge requests | Johan Sørensen | 2009-11-19 | 2 | -148/+152 | |
| | ||||||
* | Add controller+view code for setting permissions on a Committership | Johan Sørensen | 2009-11-19 | 9 | -46/+101 | |
| | ||||||
* | Fixed failing RepositoriesControllerTest (didn't set the review bit) | Johan Sørensen | 2009-11-19 | 1 | -185/+188 | |
| | ||||||
* | MergeRequest#resolvable_by? should use the committerships with a review bit | Johan Sørensen | 2009-11-19 | 4 | -2/+19 | |
| | ||||||
* | Repository#committers should only include users from committerships with ↵ | Johan Sørensen | 2009-11-19 | 3 | -9/+32 | |
| | | | | commit bit | |||||
* | Be able to get a list of permissions out of a Committership | Johan Sørensen | 2009-11-19 | 2 | -0/+9 | |
| | ||||||
* | Create the proper initial Committership permissions when a repository is created | Johan Sørensen | 2009-11-19 | 4 | -2/+20 | |
| | ||||||
* | Added auxiliary methods on Committership for checking and fetching based on ↵ | Johan Sørensen | 2009-11-19 | 2 | -11/+83 | |
| | | | | permission masks | |||||
* | Add a permissions bitmask to Committership | Johan Sørensen | 2009-11-19 | 4 | -33/+104 | |
| | ||||||
* | Call timeago() after each ajax call | Johan Sørensen | 2009-11-19 | 1 | -2/+3 | |
| | | | | So any loaded html will have the proper timestamps set | |||||
* | Don't HTML escape time_ago calls | Johan Sørensen | 2009-11-19 | 4 | -6/+6 | |
| | ||||||
* | Added a jQuery plugin for relative dates and use it instead of time_ago_in_words | Johan Sørensen | 2009-11-19 | 12 | -223/+394 | |
| | | | | | | | | The plugin uses the clients timezone, and there's a helper named time_ago() that renders the proper markup. Use this helper whenever we'd normally be using time_ago_in_words. Also do a bit of whitespace sanitizing on the affected files | |||||
* | Make sure MergeRequestVersion comment notifications says its for a merge request | Johan Sørensen | 2009-11-19 | 2 | -23/+44 | |
| | ||||||
* | Merge remote branch 'gitorious/master' | Johan Sørensen | 2009-11-17 | 0 | -0/+0 | |
|\ | | | | | | | | | * gitorious/master: Use the blob SHA1 and not the path for blob image cache keys | |||||
| * | Use the blob SHA1 and not the path for blob image cache keys | Johan Sørensen | 2009-11-17 | 1 | -2/+2 | |
| | | ||||||
* | | Use the blob SHA1 and not the path for blob image cache keys | Johan Sørensen | 2009-11-17 | 1 | -2/+2 | |
| | | ||||||
* | | Cache commit diffs with an indicator of the number of comments attached | Marius Mathiesen | 2009-11-17 | 1 | -1/+1 | |
|/ | ||||||
* | re-activate tree commit caching | Johan Sørensen | 2009-11-17 | 2 | -259/+258 | |
| | | | | and trim excess whitespace | |||||
* | Render the event timestamps on the right if we're using the ↵ | Johan Sørensen | 2009-11-17 | 2 | -4/+19 | |
| | | | | sometimes-verbose relative dates | |||||
* | Specify whether a repository accepts merge requests | Marius Mathiesen | 2009-11-17 | 12 | -3/+93 | |
| | | | | | | - On by default - Inherits the value from its parent when cloned - When set to off: do not include in targets for merges, do not display link to merge requests on Repository#show | |||||
* | Link to the comment with the sha on inline commit comments | Marius Mathiesen | 2009-11-16 | 1 | -1/+1 | |
| | ||||||
* | Don't display links to inline comments in sidebyside mode | Marius Mathiesen | 2009-11-16 | 2 | -1/+6 | |
| | ||||||
* | Enable clicking a comment to jump to the inline context. | Marius Mathiesen | 2009-11-16 | 5 | -6/+24 | |
| | | | | - Also got back support for side by side rendering of diffs |