summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5304 from owncloud/files-deleteiconpositionfixMorris Jobke2013-10-111-3/+1
|\
| * Fixed position of "delete" icon in files appVincent Petry2013-10-111-3/+1
* | Merge pull request #5207 from owncloud/fixing-4011-part2-masterThomas Müller2013-10-112-24/+29
|\ \ | |/ |/|
| * catch exceptions while uploading and pass on the error messageThomas Müller2013-10-082-24/+29
* | Merge pull request #5302 from owncloud/files-missingfileactionsafteraddVincent Petry2013-10-111-2/+5
|\ \
| * | File actions are now updated after create/upload fileVincent Petry2013-10-111-2/+5
* | | Merge pull request #5274 from owncloud/files-ie8-deletecheckboxVincent Petry2013-10-112-1/+3
|\ \ \ | |/ / |/| |
| * | Moved IE8 inline styles in files.cssVincent Petry2013-10-112-1/+3
| * | Fixed delete icon alignment in IE8Vincent Petry2013-10-111-1/+1
* | | Fixed IE8 misaligned dateVincent Petry2013-10-111-4/+0
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-105-0/+12
|/ /
* | Fixed files view regular file actions in IE8Vincent Petry2013-10-101-1/+1
* | Merge pull request #5134 from owncloud/trashbin-homeiconbrokenVincent Petry2013-10-091-3/+6
|\ \
| * | Do not call changeDirectory() when no dir set on breadcrumbVincent Petry2013-10-041-3/+6
* | | Added filesApp flag as input field for files app detectionVincent Petry2013-10-081-0/+1
* | | Merge pull request #5184 from owncloud/fix-trash-bin-buttonVicDeo2013-10-071-2/+4
|\ \ \
| * | | Fix trash bin buttonMorris Jobke2013-10-071-2/+4
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-071-0/+7
|/ / /
* | | Merge pull request #4921 from owncloud/file_conflicts_dialog_fixesVicDeo2013-10-075-41/+6
|\ \ \
| * | | remove double uri encodingJörn Friedrich Dreyer2013-10-071-4/+4
| * | | canceling individual uploads is currently impossible because there is no plac...Jörn Friedrich Dreyer2013-10-072-34/+1
| * | | remove obsolete commentJörn Friedrich Dreyer2013-10-071-2/+0
| * | | use !== comparisonJörn Friedrich Dreyer2013-10-071-1/+1
| | |/ | |/|
* / | Fix breadcrumb to reinit dnd after ajax nav #5064Vincent Petry2013-10-071-6/+8
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-0612-3/+52
* | Merge pull request #5088 from owncloud/fix_trashbin_buttonMorris Jobke2013-10-061-3/+1
|\ \
| * | trash bin button needs to be an input fieldBjoern Schiessle2013-10-021-3/+1
* | | more elegant style for Personal and Admin settingsJan-Christoph Borchardt2013-10-051-1/+1
* | | Merge pull request #5136 from owncloud/design-fixesMorris Jobke2013-10-041-3/+1
|\ \ \
| * | | increase font size of file actions for better readabilityJan-Christoph Borchardt2013-10-041-3/+1
| | |/ | |/|
* | | fix multiselect bar opacity, webrootJan-Christoph Borchardt2013-10-041-3/+3
* | | merge master into input-simplifyJan-Christoph Borchardt2013-10-046-75/+106
|\| |
| * | Merge pull request #4933 from owncloud/1376-filesappplussigninurlbugVincent Petry2013-10-041-2/+6
| |\ \
| | * | Replace plus sign with space in files app URL #4932Vincent Petry2013-09-201-2/+6
| * | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-045-67/+97
| |\ \ \
| | * \ \ Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617Björn Schießle2013-10-043-1/+16
| | |\ \ \
| | | * | | Shortened notification message that was too longVincent Petry2013-10-041-1/+1
| | | * | | fix hidden fieled nameBjoern Schiessle2013-10-041-1/+1
| | | * | | we don't know \OCA\Encryption\Session if the encryption app is not enabled, s...Bjoern Schiessle2013-10-041-2/+2
| | | * | | Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-3013-14/+53
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-2394-793/+2013
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-1626-275/+653
| | | |\ \ \ \ \
| | | * | | | | | no longer enforce log out, but provide useful errors/warnings insteadBjoern Schiessle2013-09-063-1/+16
| | * | | | | | | increase height of controls bar and elements to more clickable 44pxJan-Christoph Borchardt2013-10-042-32/+82
| | * | | | | | | remove duplicate upload CSS from files.cssJan-Christoph Borchardt2013-10-031-35/+0
| * | | | | | | | Merge branch 'master' into sharing_mail_notification_masterThomas Müller2013-10-024-14/+18
| |\| | | | | | |
| * | | | | | | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-0219-20/+86
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-2394-793/+2013
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-1621-264/+631
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-059-10/+22
| |\ \ \ \ \ \ \ \