| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-27 | 3 | -0/+8 |
| | | |||||
| * | Merge pull request #4887 from owncloud/sharing_disable_public_upload | Björn Schießle | 2013-09-26 | 1 | -2/+2 |
| |\ | | | | | check only permission from link-share to decide if public upload is enabled or disabled | ||||
| | * | we can leave the loop if the permission of the link share was checked | Bjoern Schiessle | 2013-09-17 | 1 | -3/+1 |
| | | | |||||
| | * | check only permission from link-share to decide if public upload is enabled ↵ | Bjoern Schiessle | 2013-09-17 | 1 | -1/+3 |
| | | | | | | | | | or disabled | ||||
| * | | Merge pull request #4987 from owncloud/different_color_placeholder | Morris Jobke | 2013-09-25 | 1 | -2/+13 |
| |\ \ | | | | | | | Make it possible to have a different color than the username for placeholder | ||||
| | * | | Shorten optional text-argument processing | kondou | 2013-09-25 | 1 | -3/+2 |
| | | | | |||||
| | * | | Make it possible to have a different color than the username for placeholder | kondou | 2013-09-25 | 1 | -2/+14 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-24 | 4 | -4/+36 |
| |/ / | |||||
| * | | Merge pull request #4896 from owncloud/sharing_allow_disable_password | Björn Schießle | 2013-09-23 | 1 | -1/+12 |
| |\ \ | | | | | | | sharing, allow user to disable password protection | ||||
| | * | | 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 |
| | |/ | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-22 | 65 | -12/+139 |
| | | | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-20 | 83 | -18/+183 |
| | | | |||||
| * | | Merge pull request #4684 from owncloud/improved-console | Bart Visscher | 2013-09-19 | 2 | -0/+43 |
| |\ \ | | | | | | | Use more object oriented way for console commands | ||||
| | * | | Add copyright, remove starting blank line | Bart Visscher | 2013-09-19 | 1 | -0/+6 |
| | | | | |||||
| | * | | Use appinfo/register_command.php to add commands to the console command | Bart Visscher | 2013-09-13 | 1 | -0/+9 |
| | | | | |||||
| | * | | Cleanup and more style fixes | Bart Visscher | 2013-09-02 | 1 | -7/+5 |
| | | | | |||||
| | * | | Use more object oriented way for console commands | Bart Visscher | 2013-09-01 | 1 | -0/+30 |
| | | | | |||||
| * | | | Merge pull request #4908 from owncloud/fix_css_selector | Bart Visscher | 2013-09-19 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | css selectors never have a : before [] | ||||
| | * | | | 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 | 16 | -0/+152 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js | ||||
| | * \ \ \ | Merge pull request #4263 from owncloud/search_scrollto | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -0/+13 |
| | |\ \ \ \ | | |/ / / | |/| | | | initial scrollto implementation | ||||
| | | * | | | initial scrollto implementation: | Jörn Friedrich Dreyer | 2013-09-17 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use places/folder icon, move link construction to JS, only show icon on hover, use 'searchresult' as css class name, add filter/unfilter methods, highlight searched files in current filelist only filter when correct FileList is present | ||||
| | * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-18 | 15 | -0/+139 |
| | | | | | | |||||
| | * | | | | 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 |
| | | | | | | | | | | | | | | | | | ... maybe something is wrong there | ||||
| * | | | | 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 |
| |\| | | | |||||
| | * | | | Merge pull request #4871 from owncloud/add_exists_method_to_jquery | Bernhard Posselt | 2013-09-17 | 1 | -1/+10 |
| | |\ \ \ | | |/ / | |/| | | add exists method to jquery | ||||
| | | * | | 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 | 49 | -73/+401 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/css/files.css apps/files/js/file-upload.js apps/files/js/filelist.js apps/files/js/files.js apps/files_sharing/js/public.js core/js/jquery.ocdialog.js core/js/oc-dialogs.js | ||||
| | * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-16 | 36 | -36/+0 |
| | |/ / | |||||
| | * | | Merge pull request #4835 from owncloud/fix-apps-height | Morris Jobke | 2013-09-15 | 1 | -2/+2 |
| | |\ \ | | | | | | | | | use lineheight instead of padding and height | ||||
| | | * | | use lineheight instead of padding and height | Bernhard Posselt | 2013-09-13 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enter | Morris Jobke | 2013-09-15 | 1 | -2/+4 |
| | |\ \ \ | | | | | | | | | | | Fixes #4465 - Added autoFocus to #shareWith autocomplete options | ||||
| | | * | | | 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() | ||||
| | | * | | | | 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 | 6 | -2/+288 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | OC Avatars | ||||
| | | * | | | | | Remove superfluous $ | kondou | 2013-09-14 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Merge branch 'master' into oc_avatars | kondou | 2013-09-12 | 17 | -73/+184 |
| | | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | | Add a comment to clear defaultavatar-functionality | kondou | 2013-09-11 | 1 | -0/+1 |
| | | | | | | | | |||||
| | | * | | | | | Bring another enable_avatars to $_ and fix $thus->$this | kondou | 2013-09-11 | 1 | -1/+1 |
| | | | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |