summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* replace horizontal rules with whitespaceJan-Christoph Borchardt2014-09-171-3/+4
|
* Do not show exception to the end-userLukas Reschke2014-09-178-63/+74
| | | | Log the error instead of potentially leaking sensitive information
* Merge pull request #10745 from owncloud/fix-10708-doctrineLukas Reschke2014-09-162-9/+35
|\ | | | | Use Doctrine Platform to generate SQL query for table truncation.
| * adding unit test to truncate the tableThomas Müller2014-09-162-1/+32
| |
| * Use Doctrine Platform to generate SQL query for table truncation.Andreas Fischer2014-08-291-8/+3
| |
* | Merge pull request #10902 from owncloud/fix-ellepsisLukas Reschke2014-09-162-0/+7
|\ \ | | | | | | Adding link to ellipsis and fixing styling
| * | Adding link to ellipsis and fixing stylingClark Tomlinson2014-09-162-0/+7
| | |
* | | Merge pull request #11009 from owncloud/tobiasKaminsky-routeLukas Reschke2014-09-164-2/+99
|\ \ \ | | | | | | | | REST API for thumbnails
| * | | Route for thumbnail generationtobiasKaminsky2014-09-164-2/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thumbnail generation Removed Log Added requested changes Added requested changes. - Fix code style - Add exception if file does not exist - Switch route styling Replaces https://github.com/owncloud/core/pull/10805 Fix codestyle Fix codestyle Migrate to appframework Fix typo
* | | | Merge pull request #11102 from owncloud/visit1985-issue_108Lukas Reschke2014-09-161-24/+38
|\ \ \ \ | | | | | | | | | | mysql setup: if dbuser exists try a different one (owncloud/core#108)
| * | | | simplify mysql user creation flowMichael Göhler2014-09-161-24/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if dbuser exists try a different one, owncloud/core#108 changed outdated comment corrected length calculation changed indentation for else clauses
* | | | | Merge pull request #10896 from owncloud/undo-nav-entryMorris Jobke2014-09-161-0/+35
|\ \ \ \ \ | | | | | | | | | | | | Add delete undo styles
| * | | | | add delete undo stylesBernhard Posselt2014-09-161-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use less right padding better styling, fix padding issues no special color for undo nav entry fix fallback width use class for button
* | | | | | Merge pull request #7254 from owncloud/core-sortalgoLukas Reschke2014-09-169-4/+527
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed JS sort comparator to be consistent between JS and PHP
| * | | | | | Fixed sort algo for additional casesVincent Petry2014-08-114-3/+14
| | | | | | |
| * | | | | | Fixed file list sortingVincent Petry2014-08-119-4/+516
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now using a natural sort algorithm that is more consistent between JS and PHP (although not perfect in some corner cases) - added OC.Util.naturalSortComparator that uses the same algo that was used for the user list - changed user list and files list to use OC.Util.naturalSortComparator - removed toLowerCase() and changed the comparator to use String.localeCompare() - added unit tests - added OC_NaturalSort that is used by OCP\Util::naturalSortCompare()
* | | | | | | Merge pull request #10680 from helmutschneider/aws-2.6.15Lukas Reschke2014-09-16264-9790/+5917
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update AWS sdk to 2.6.15
| * | | | | | | Fix failing AmazonS3::touch on updated aws sdkJohan Björk2014-09-031-1/+2
| | | | | | | |
| * | | | | | | Update AWS sdk to 2.6.15Johan Björk2014-09-03263-9789/+5915
| | | | | | | |
* | | | | | | | Merge pull request #11082 from owncloud/deduplicateDependencyCheckThomas Müller2014-09-161-70/+42
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Deduplicate dependency checks
| * | | | | | | | Deduplicate dependency checksLukas Reschke2014-09-161-70/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some code that I also used for https://github.com/owncloud/administration/pull/11
* | | | | | | | | Merge pull request #11108 from owncloud/add-proper-descrLukas Reschke2014-09-161-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Reword the description
| * | | | | | | | | Reword the descriptionLukas Reschke2014-09-161-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | The old one was just horrible wrong.
* | | | | | | | | Merge pull request #10754 from cetra3/masterLukas Reschke2014-09-161-7/+37
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | Refactor internal session handler to write directly to $_SESSION
| * | | | | | | | Merge branch 'master' of https://github.com/owncloud/corecetra32014-09-081738-512781/+6129
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Refactor internal session to write directly to $_SESSIONcetra32014-08-301-7/+37
| | | | | | | | | |
* | | | | | | | | | Merge pull request #11055 from owncloud/replaceprodnameThomas Müller2014-09-161-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | replace ownCloud with placeholder
| * | | | | | | | | | replace ownCloud with placeholderVolkan Gezer2014-09-131-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #11084 from owncloud/no-migration-for-mssql-masterLukas Reschke2014-09-162-0/+26
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Disable database migrations for MSSQL - scripts have to be applied manua...
| * | | | | | | | | | | Disable database migrations for MSSQL - scripts have to be applied manuallyThomas Müller2014-09-152-0/+26
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #11081 from owncloud/trash_fix_expireLukas Reschke2014-09-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | also expire file if timestamp = limit, happens if trashbin_retention_obl...
| * | | | | | | | | | | | also expire file if timestamp = limit, happens if ↵Bjoern Schiessle2014-09-151-1/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trashbin_retention_obligation is set to zero
* | | | | | | | | | | | Merge pull request #10663 from owncloud/files_trashbin_original_pathMorris Jobke2014-09-167-5/+79
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | Show original path information in trashbin and for shares
| * | | | | | | | | | | patch tipsy in style.css - don't patch 3rdparty librariesMorris Jobke2014-09-162-1/+6
| | | | | | | | | | | |
| * | | | | | | | | | | Better tooltip handling of very long stringsRobin McCorkell2014-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Maximum tooltip length now 400px instead of 200px * Overflowing strings create ellipsis (...)
| * | | | | | | | | | | Show original path information in trashbin and sharing viewsRobin McCorkell2014-09-117-5/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Path will only be shown if in subdirectory, not in root.
* | | | | | | | | | | | Revert "improve logo flexibility to fix wide custom logo alignment, fix #9339"Vincent Petry2014-09-162-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 064e6951e1ef792422ff6cf24fce79c2320d4d5e. Reverting due to regression that breaks styles in error page, setup page and others. Fixes #10967
* | | | | | | | | | | | Merge pull request #11090 from owncloud/fix-undefined-class-and-phpdocMorris Jobke2014-09-161-16/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix unexisting class and PHPDoc
| * | | | | | | | | | | | Fix unexisting class and PHPDocLukas Reschke2014-09-151-16/+8
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can't add int here as hint...
* | | | | | | | | | | | Merge pull request #10639 from owncloud/fix_naming_schema_preview_with_aspectMorris Jobke2014-09-161-7/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | add y to with-aspect naming schema
| * | | | | | | | | | | | add phpdocGeorg Ehrke2014-09-151-0/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | add y to with-aspect naming schemaGeorg Ehrke2014-09-151-7/+13
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #10362 from owncloud/preserve_transparency_on_fileloadMorris Jobke2014-09-162-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preserve transparency when loading from a file
| * | | | | | | | | | | | | Preserve transparency when loading from a filekondou2014-09-102-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #7148 - again :)
* | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1624-17/+38
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #11040 from owncloud/fix-app-menu-overlappJan-Christoph Borchardt2014-09-152-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove bottom: 0 from app-navigation-entry-utils to prevent the utils form overlapping the whole element....
| * | | | | | | | | | | | | | add some minor fixes for IE8Morris Jobke2014-09-152-1/+5
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | remove bottom: 0 to prevent the menu form overlapping the whole element. ↵Bernhard Posselt2014-09-151-2/+2
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happens if a folder has entries, the menu expands to the very bottom and overlaps all entries and makes them impossible to click fix input width which was changed likely with the icon PR use calc because firefox and chrome have different scrollbar widths which causes firefox to push the button into the next row while everything is well in chrome add normal width for IE8
* | | | | | | | | | | | | | Merge pull request #11023 from owncloud/users-fixundoLukas Reschke2014-09-153-5/+237
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add timeout to user and group deletion notification.
| * | | | | | | | | | | | | | Add timeout to user and group deletion notificationVincent Petry2014-09-153-5/+237
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added timeout in DeleteHandler to auto-delete after a delay. Fixed issue where OC.Notification.hide() was called twice in a row when deleting multiple entries, causing the second notification to disappear. Fixed issue where "undo" click event handler was registered multiple times when calling setNotifications() twice. Added JS unit tests for the DeleteHandler class. Refix undo users, groups feature Timeout is now cleared in cancel(). Fixed click handler name for "undo" to be able to work with multiple DeleteHandler instances (in our case one for users and one for groups) so that there is no conflict.
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-10 08:51:25 +0000