summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | Remove test error :PThomas Tanghus2013-09-111-1/+1
| | * | | | | | | | | | | Don't popup meaningless alerts when dialog called on page leaveThomas Tanghus2013-09-111-9/+21
| | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| * | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-133-1/+24
| | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #4735 from owncloud/multiple_mimetypes_rawlistThomas Tanghus2013-09-111-1/+8
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Use shorter array-conversionkondou2013-09-061-3/+1
| | * | | | | | | | | | Only use mimetype_list and clean up a bitkondou2013-09-051-10/+12
| | * | | | | | | | | | Make it possible to pass rawlist.php an JSON array, to filter by more than on...kondou2013-09-051-4/+11
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #4784 from owncloud/ocdialog_option_setterThomas Tanghus2013-09-111-6/+10
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix double destroy on escape.Thomas Tanghus2013-09-111-1/+2
| | * | | | | | | | | | Remove console loggingThomas Tanghus2013-09-101-1/+0
| | * | | | | | | | | | Fix setting ocdialog options after initialization.Thomas Tanghus2013-09-101-5/+9
| * | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-112-4/+14
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-107-16/+80
|\| | | | | | | | | |
| * | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-103-12/+36
| |/ / / / / / / / /
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-081-4/+20
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-073-0/+24
* | | | | | | | | | 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
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #4704 from owncloud/rename-lostpassword-controllerBart Visscher2013-09-052-26/+26
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge branch 'master' into rename-lostpassword-controllerThomas Müller2013-09-0412-51/+116
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | * | | | | | | | Use the namespaced variation of the classname.Bart Visscher2013-09-022-26/+26
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-054-20/+46
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | 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
|\| | | | | | | |
| * | | | | | | | Merge pull request #4449 from owncloud/clean_up_utilMorris Jobke2013-09-033-5/+5
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into clean_up_utilkondou2013-09-02177-619/+3800
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into clean_up_utilkondou2013-08-20107-649/+557
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix some naming and spacing in lib/util.phpkondou2013-08-181-1/+1
| | * | | | | | | | | | Clean up \OC\Utilkondou2013-08-153-5/+5
| * | | | | | | | | | | Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepickerMorris Jobke2013-09-031-1/+5
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Add previews to OC.dialogs.filepicker(); Fix #4697kondou2013-09-031-1/+5
| * | | | | | | | | | | | Merge pull request #4707 from owncloud/use_on_instead_of_deprecated_bindChristopher2013-09-031-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | use on to add event listener instead of deprecated jquery bindJörn Friedrich Dreyer2013-09-031-1/+2
| | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #4473 from owncloud/texteditor_polishingJörn Friedrich Dreyer2013-09-031-20/+29
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | refactor OC.Breadcrumbs, allow injection of container to allow rendering crum...Jörn Friedrich Dreyer2013-08-161-20/+29
| * | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-032-4/+27
| * | | | | | | | | | | | | Merge pull request #4702 from owncloud/center-utilsMorris Jobke2013-09-031-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | center utilsBernhard Posselt2013-09-021-0/+1
| | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #4695 from owncloud/placeholder-hslMorris Jobke2013-09-031-8/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | placeholder.js: fix typoJan-Christoph Borchardt2013-09-021-1/+1
| | * | | | | | | | | | | | placeholder.js: adjust saturation and lightness valuesJan-Christoph Borchardt2013-09-021-2/+2