summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | don't remember login if the encrypion app is enabled because the userBjoern Schiessle2013-09-241-1/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-305-3/+47
* | | | | | | followup of #4032 - makes the settings-button bigger and adds again padding a...Alessandro Cosentino2013-09-291-1/+2
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-292-6/+20
* | | | | | | Base defaultavatar text on displaynamekondou2013-09-282-2/+6
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-273-0/+8
* | | | | | | Merge pull request #4887 from owncloud/sharing_disable_public_uploadBjörn Schießle2013-09-261-2/+2
|\ \ \ \ \ \ \
| * | | | | | | we can leave the loop if the permission of the link share was checkedBjoern Schiessle2013-09-171-3/+1
| * | | | | | | check only permission from link-share to decide if public upload is enabled o...Bjoern Schiessle2013-09-171-1/+3
* | | | | | | | Merge pull request #4987 from owncloud/different_color_placeholderMorris Jobke2013-09-251-2/+13
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Shorten optional text-argument processingkondou2013-09-251-3/+2
| * | | | | | | Make it possible to have a different color than the username for placeholderkondou2013-09-251-2/+14
| | |/ / / / / | |/| | | | |
* / | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-244-4/+36
|/ / / / / /
* | | | | | Merge pull request #4896 from owncloud/sharing_allow_disable_passwordBjörn Schießle2013-09-231-1/+12
|\ \ \ \ \ \
| * | | | | | initialize variableBjoern Schiessle2013-09-201-0/+1
| * | | | | | calculate correct permissions while toggle the password protectionBjoern Schiessle2013-09-201-1/+11
| |/ / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-2265-12/+139
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-2083-18/+183
* | | | | | Merge pull request #4684 from owncloud/improved-consoleBart Visscher2013-09-192-0/+43
|\ \ \ \ \ \
| * | | | | | Add copyright, remove starting blank lineBart Visscher2013-09-191-0/+6
| * | | | | | Use appinfo/register_command.php to add commands to the console commandBart Visscher2013-09-131-0/+9
| * | | | | | Cleanup and more style fixesBart Visscher2013-09-021-7/+5
| * | | | | | Use more object oriented way for console commandsBart Visscher2013-09-011-0/+30
* | | | | | | Merge pull request #4908 from owncloud/fix_css_selectorBart Visscher2013-09-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | css selectors never have a : before []Jörn Friedrich Dreyer2013-09-191-1/+1
* | | | | | | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-1916-0/+152
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #4263 from owncloud/search_scrolltoJörn Friedrich Dreyer2013-09-191-0/+13
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | initial scrollto implementation:Jörn Friedrich Dreyer2013-09-171-0/+13
| * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-1815-0/+139
| * | | | | | | | disable avatar loading on public guest pageJörn Friedrich Dreyer2013-09-171-3/+5
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | use {count} instead of 'One' for more versatile translationJörn Friedrich Dreyer2013-09-191-1/+1
* | | | | | | | use n to translate titleJörn Friedrich Dreyer2013-09-191-1/+7
* | | | | | | | use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky .....Jörn Friedrich Dreyer2013-09-191-1/+1
* | | | | | | | fix 'event is not defined' errorJörn Friedrich Dreyer2013-09-191-1/+1
* | | | | | | | indentationJörn Friedrich Dreyer2013-09-181-43/+43
* | | | | | | | simplify conflict template handling, fix reopen after ESCJörn Friedrich Dreyer2013-09-181-13/+11
* | | | | | | | allow passing classes to buttonsJörn Friedrich Dreyer2013-09-181-0/+3
* | | | | | | | we cannot load avatar on guest pageJörn Friedrich Dreyer2013-09-171-3/+5
* | | | | | | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-171-1/+10
|\| | | | | | |
| * | | | | | | Merge pull request #4871 from owncloud/add_exists_method_to_jqueryBernhard Posselt2013-09-171-1/+10
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | add exists method to jqueryJörn Friedrich Dreyer2013-09-161-1/+10
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-1749-73/+401
|\| | | | | |
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-1636-36/+0
| |/ / / / /
| * | | | | Merge pull request #4835 from owncloud/fix-apps-heightMorris Jobke2013-09-151-2/+2
| |\ \ \ \ \
| | * | | | | use lineheight instead of padding and heightBernhard Posselt2013-09-131-2/+2
| * | | | | | Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enterMorris Jobke2013-09-151-2/+4
| |\ \ \ \ \ \
| | * | | | | | no autoFocus if no users returnedPete McFarlane2013-09-111-1/+3
| | * | | | | | Added autoFocus to #shareWith autocomplete optionsPete McFarlane2013-09-111-3/+3
| * | | | | | | Merge pull request #4853 from owncloud/external-shared_mimetype-iconsThomas Müller2013-09-151-5/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Use external and shared icons in OC.Dialogs.filepicker()kondou2013-09-141-5/+1