Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Make it possible to have a different color than the username for placeholder | kondou | 2013-09-25 | 1 | -2/+14 | |
* | | | some small js fixes | Bjoern Schiessle | 2013-09-24 | 1 | -4/+5 | |
* | | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-23 | 5 | -6/+299 | |
|\| | | ||||||
| * | | Merge pull request #4896 from owncloud/sharing_allow_disable_password | Björn Schießle | 2013-09-23 | 1 | -1/+12 | |
| |\ \ | ||||||
| | * | | initialize variable | Bjoern Schiessle | 2013-09-20 | 1 | -0/+1 | |
| | * | | calculate correct permissions while toggle the password protection | Bjoern Schiessle | 2013-09-20 | 1 | -1/+11 | |
| | |/ | ||||||
| * | | Merge pull request #4908 from owncloud/fix_css_selector | Bart Visscher | 2013-09-19 | 1 | -1/+1 | |
| |\ \ | ||||||
| | * | | css selectors never have a : before [] | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -1/+1 | |
| * | | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -0/+13 | |
| |\ \ \ | ||||||
| | * \ \ | Merge pull request #4263 from owncloud/search_scrollto | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -0/+13 | |
| | |\ \ \ | | | |/ / | | |/| | | ||||||
| | | * | | initial scrollto implementation: | Jörn Friedrich Dreyer | 2013-09-17 | 1 | -0/+13 | |
| | * | | | disable avatar loading on public guest page | Jörn Friedrich Dreyer | 2013-09-17 | 1 | -3/+5 | |
| | | |/ | | |/| | ||||||
| * | | | use {count} instead of 'One' for more versatile translation | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -1/+1 | |
| * | | | use n to translate title | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -1/+7 | |
| * | | | use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ..... | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -1/+1 | |
| * | | | fix 'event is not defined' error | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -1/+1 | |
| * | | | indentation | Jörn Friedrich Dreyer | 2013-09-18 | 1 | -43/+43 | |
| * | | | simplify conflict template handling, fix reopen after ESC | Jörn Friedrich Dreyer | 2013-09-18 | 1 | -13/+11 | |
| * | | | allow passing classes to buttons | Jörn Friedrich Dreyer | 2013-09-18 | 1 | -0/+3 | |
| * | | | we cannot load avatar on guest page | Jörn Friedrich Dreyer | 2013-09-17 | 1 | -3/+5 | |
| * | | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-17 | 1 | -1/+10 | |
| |\| | | ||||||
| | * | | add exists method to jquery | Jörn Friedrich Dreyer | 2013-09-16 | 1 | -1/+10 | |
| | |/ | ||||||
| * | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-17 | 6 | -28/+165 | |
| |\| | ||||||
| * | | fix ESC for conflicts dialog | Jörn Friedrich Dreyer | 2013-09-08 | 1 | -2/+0 | |
| * | | close and destroy dialog on ESC | Jörn Friedrich Dreyer | 2013-09-08 | 1 | -1/+4 | |
| * | | show preview for uploading image files on conflict | Robin Appelman | 2013-09-07 | 1 | -16/+71 | |
| * | | fine ie8 compatability | Jörn Friedrich Dreyer | 2013-09-06 | 1 | -6/+10 | |
| * | | fix page leaving checks | Jörn Friedrich Dreyer | 2013-09-06 | 1 | -5/+6 | |
| * | | completely remove dialog on cancel/continue | Jörn Friedrich Dreyer | 2013-09-06 | 1 | -1/+2 | |
| * | | cleanup dead code | Jörn Friedrich Dreyer | 2013-09-05 | 1 | -3/+4 | |
| * | | separate uploading code from progress code, add progress capability detection | Jörn Friedrich Dreyer | 2013-09-05 | 1 | -8/+5 | |
| * | | refactor dialog creation | Jörn Friedrich Dreyer | 2013-09-04 | 1 | -88/+46 | |
| * | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-04 | 16 | -84/+166 | |
| |\ \ | ||||||
| * | | | reduced complexity, added listing conflicts to dialog | Jörn Friedrich Dreyer | 2013-08-22 | 1 | -116/+189 | |
| * | | | progress fixes | Jörn Friedrich Dreyer | 2013-08-16 | 1 | -89/+126 | |
| * | | | change filelist ui updates | Jörn Friedrich Dreyer | 2013-08-14 | 2 | -11/+7 | |
| * | | | fix whitespace, check selected files before starting upload | Jörn Friedrich Dreyer | 2013-08-14 | 2 | -2/+135 | |
* | | | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-16 | 6 | -22/+165 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enter | Morris Jobke | 2013-09-15 | 1 | -2/+4 | |
| |\ \ \ | ||||||
| | * | | | no autoFocus if no users returned | Pete McFarlane | 2013-09-11 | 1 | -1/+3 | |
| | * | | | Added autoFocus to #shareWith autocomplete options | Pete McFarlane | 2013-09-11 | 1 | -3/+3 | |
| | | |/ | | |/| | ||||||
| * | | | Merge pull request #4853 from owncloud/external-shared_mimetype-icons | Thomas Müller | 2013-09-15 | 1 | -5/+1 | |
| |\ \ \ | ||||||
| | * | | | Use external and shared icons in OC.Dialogs.filepicker() | kondou | 2013-09-14 | 1 | -5/+1 | |
| * | | | | Merge pull request #4506 from owncloud/oc_avatars | Bernhard Posselt | 2013-09-14 | 2 | -0/+92 | |
| |\ \ \ \ | ||||||
| | * | | | | Merge branch 'master' into oc_avatars | kondou | 2013-09-12 | 2 | -7/+18 | |
| | |\| | | | ||||||
| | * | | | | Clean up avatars and preliminary use JSON->rawlist.php | kondou | 2013-09-05 | 1 | -10/+10 | |
| | * | | | | Have login-checks and CSRF checks | kondou | 2013-09-05 | 1 | -1/+1 | |
| | * | | | | Merge branch 'master' into oc_avatars | kondou | 2013-09-04 | 4 | -32/+43 | |
| | |\ \ \ \ | | | | |/ / | | | |/| | | ||||||
| | * | | | | Fix unwanted caching in IE8 | kondou | 2013-09-03 | 1 | -3/+11 | |
| | * | | | | Don't use HTML5 <header> to support avatars in IE8 | kondou | 2013-09-03 | 1 | -1/+1 |