Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

issue-3564 #5

Open
wants to merge 189 commits into
base: master
Choose a base branch
from
Open

issue-3564 #5

wants to merge 189 commits into from

Conversation

stuartf
Copy link
Owner

@stuartf stuartf commented Feb 26, 2014

No description provided.

@bertpareyn
Replace spanx by col-md-x and row-fluid by row for bootstrap …
1d83c8d 
…3.0.0 upgrade
@bertpareyn
Upgrade modals, buttons and navigation to Bootstrap 3
9efacdf
@bertpareyn
Upgrade index, dashboard and content profile widgets to Bootstrap 3, …
ea833eb 
…Structural changes for mobile, various tweaks throughout.
@bertpareyn
Upgrade search pages, uploadnewversion and register to bootstrap3
bf4886a
@bertpareyn
Upgrade the libraries to bootstrap 3.0
dd5f778
@bertpareyn
Update form validation, Update progress indication
3258db3
@bertpareyn
Update notify to bootstrap 3.0, Updates to the content profile page
22ee8dd
@bertpareyn
Make large list options flexible
5f665e8
@bertpareyn
Address large list options visual issues
e56b767
@bertpareyn
Upgrade the admin UI to bootstrap 3.0
2578e3e
@bertpareyn
Upgrade Admin UI modals to Bootstrap 3.0
36f859a
@bertpareyn
Adjust footer and header in Admin UI
827935c
@bertpareyn
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
5176b4f 
…o bootstrap3
@bertpareyn
Refinements to the responsive left hand navigation
0486c9f
@bertpareyn
Remove unnecessary page CSS
080e821
@bertpareyn
Merge origin/master and fix conflicts
4556728
@bertpareyn
Merge origin/master and fix conflicts
6b2edad
@bertpareyn
Address Bootstrap 3 top navigation issues
aa6d504
@bertpareyn
More top navigation and register widget work
69ad820
@bertpareyn
Activity, notifications and lists adjustments for Bootstrap 3
9f54c5a
@bertpareyn
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
d798728 
…o bootstrap3
@bertpareyn
Further improvements to Bootstrap 3 upgrade
299e5fb
@bertpareyn
Bootstrap tweaks
df7d478
@bertpareyn
Admin UI fixes for bootstrap 3 upgrade
79cc5ec
@bertpareyn
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
4f43393 
…o bootstrap3
@bertpareyn
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
78d47dc 
…o bootstrap3
@bertpareyn
Align left hand navigation with top of content
8707aaf
@bertpareyn
Merge origin/master and fix conflicts
6be0e04
@bertpareyn
Merge origin/master and fix conflicts
7696f44
@bertpareyn
Merge origin/master and fix conflicts, update various widgets to comp…
1e0403c 
…ly with Bootstrap 3 syntax
Nicolaas Matthijs and others added 30 commits February 17, 2014 18:57
Merge branch 'issue-3404' of https://github.com/bp323/3akai-ux into i…
31f4573 
…ssue-3404
Added reference to external PR
2a2ddd6
Merge branch 'issue3381' of https://github.com/bp323/3akai-ux into is…
358532e 
…sue3381
Follow up on delete comment notification
46703af
Self review on deleting comments
9914ab1
@sathomas
only add share to lhnav if user can share
f476a77
Merge branch 'master' into bootstrap3
1538eea 
Conflicts:
	ui/bundles/es_ES.properties
Merge branch 'issue-3396' of https://github.com/bp323/3akai-ux into i…
4f9f3d8 
…ssue-3396
Merge branch 'issue-3388' of https://github.com/bp323/3akai-ux into i…
8cd401a 
…ssue-3388
Merge branch 'master' into bootstrap3
3d07a76
@bertpareyn
Merge origin/master and fix conflicts
c097682
@bertpareyn
Merge branch 'bootstrap3' of https://github.com/sakaiproject/3akai-ux …
83289b8 
…into bootstrap3
Merge branch 'master' into bootstrap3
eeaf56b
@bertpareyn
Merge remote-tracking branch 'origin/master' into bootstrap3
fab8070
@bertpareyn
Merge origin/master and fix conflicts
68d8845
@bertpareyn
Fix hard to read tile description in Safari
75db6df
@bertpareyn
Overhaul forgotten control-group to form-group in comments and clean …
184515f 
…up some other areas that referenced control-group
Merge branch 'issue-3542' of github.com:sathomas/3akai-ux into issue-…
4ee2e97 
…3542
Do not show share for discussions that can't be shared
324d868
Merge branch 'issue-3480' of https://github.com/bp323/3akai-ux into i…
ece8eb0 
…ssue-3480
Moved placeholder to end
ae8b887
Merge branch 'issue-3455' of https://github.com/bp323/3akai-ux into i…
54e1734 
…ssue-3455
Renamed muted to description
8071793
Merge branch 'host-wrap' of https://github.com/bp323/3akai-ux into ho…
56294b0 
…st-wrap
Merge branch 'issue-3386' of https://github.com/bp323/3akai-ux into i…
f874b74 
…ssue-3386
Remove custom styling for empty document message
beaca9a
Removed unused id
5a983f5
@bertpareyn
Merge remote-tracking branch 'origin/master' into bootstrap3
7681b33
@stuartf
eliminate double forms on setpermissions
b65aba9
@stuartf
fix setpermissions update button
3b104c4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@stuartf @bertpareyn @mrvisser @Coenego @simong @sathomas