summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-2392-60/+795
|\
| * 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 branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-107-16/+80
| |\ \ \
| * \ \ \ Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core i...Jörn Friedrich Dreyer2013-09-082-52/+2
| |\ \ \ \
| | * | | | Optimize triangle-e.png and triangle-e.svgkondou2013-09-082-52/+2
| * | | | | fix ESC for conflicts dialogJörn Friedrich Dreyer2013-09-081-2/+0
| |/ / / /
| * | | | close and destroy dialog on ESCJörn Friedrich Dreyer2013-09-081-1/+4
| * | | | show preview for uploading image files on conflictRobin Appelman2013-09-071-16/+71
| * | | | fine ie8 compatabilityJörn Friedrich Dreyer2013-09-061-6/+10
| * | | | fix page leaving checksJörn Friedrich Dreyer2013-09-061-5/+6
| * | | | completely remove dialog on cancel/continueJörn Friedrich Dreyer2013-09-061-1/+2
| * | | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-066-46/+72
| |\ \ \ \
| * | | | | cleanup dead codeJörn Friedrich Dreyer2013-09-051-3/+4
| * | | | | separate uploading code from progress code, add progress capability detectionJörn Friedrich Dreyer2013-09-051-8/+5
| * | | | | refactor dialog creationJörn Friedrich Dreyer2013-09-041-88/+46
| * | | | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-04229-1272/+4376
| |\ \ \ \ \
| * | | | | | reduced complexity, added listing conflicts to dialogJörn Friedrich Dreyer2013-08-221-116/+189
| * | | | | | progress fixesJörn Friedrich Dreyer2013-08-161-89/+126
| * | | | | | add triangle icon eastJörn Friedrich Dreyer2013-08-162-0/+54
| * | | | | | change filelist ui updatesJörn Friedrich Dreyer2013-08-142-11/+7
| * | | | | | fix whitespace, check selected files before starting uploadJörn Friedrich Dreyer2013-08-142-2/+135
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-26 19:26:28 +0000