summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8416 from owncloud/sharing_keep_mount_points_visibleBjörn Schießle2014-05-2110-78/+432
|\ | | | | [sharing] move the mount point up if the parent folder no longer exists
| * move the mount point up if a share is mounted to a subfolder and the ↵Bjoern Schiessle2014-05-2110-78/+432
| | | | | | | | subfolder no longer exists
* | Merge pull request #8652 from owncloud/logfile_rotateMorris Jobke2014-05-211-1/+2
|\ \ | | | | | | rotate custom logfile if defined
| * | use custom logfile path if defined, otherwise use default of owncloud.log in ↵scolebrook2014-05-201-1/+2
| | | | | | | | | | | | data directory
* | | Merge pull request #8612 from owncloud/share-updateshareiconsafterrenameBjörn Schießle2014-05-212-35/+73
|\ \ \ | |_|/ |/| | [master] Fixed issues with renaming
| * | Fixed issues with renamingVincent Petry2014-05-162-35/+73
| | | | | | | | | | | | | | | | | | | | | | | | - summary is now untouched on rename instead of bogus incrementation - fixes "Share" status icon by only triggring "fileActionsReady" once - row is now reinserted even when rename is cancelled, this removes the hacky/buggy code that tried to rename the element back - added unit tests to cover the fixed cases
* | | Merge pull request #8646 from owncloud/publicshare-fixesBjörn Schießle2014-05-213-24/+31
|\ \ \ | | | | | | | | [master] Fixed for public link page
| * | | Fixed JS issues in public pageVincent Petry2014-05-202-23/+30
| | | | | | | | | | | | | | | | | | | | - fixed subdir detection when uploading into subdir - add class detection before overriding to avoid JS errors
| * | | Fixed download URL in public pageVincent Petry2014-05-201-1/+1
| | |/ | |/|
* | | Merge pull request #8637 from owncloud/enc_improved_error_handlingVincent Petry2014-05-212-3/+49
|\ \ \ | |/ / |/| | [encryption] improved error handling during password change
| * | only start migration if the encryption was initialized; allow to overwrite ↵Bjoern Schiessle2014-05-192-3/+49
| | | | | | | | | | | | keys if no files exists
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-2083-322/+11920
| | |
* | | Merge pull request #8639 from owncloud/drop-briefThomas Müller2014-05-19130-864/+884
|\ \ \ | | | | | | | | Remove all occurences of @brief and @returns from PHPDoc
| * | | Remove all occurences of @brief and @returns from PHPDocMorris Jobke2014-05-19130-868/+888
| | | | | | | | | | | | | | | | * test case added to avoid adding them later
* | | | Merge pull request #6457 from owncloud/db-convert-toolFrank Karlitschek2014-05-195-98/+495
|\ \ \ \ | |/ / / |/| | | Command line tool to convert current database to others, except sqlite
| * | | fixing typos and adding PHPDocThomas Müller2014-05-121-2/+3
| | | |
| * | | Add message about unsupported Microsoft SQL Server.Andreas Fischer2014-05-091-0/+5
| | | |
| * | | Store normalised DBMS type in $type.Andreas Fischer2014-05-091-2/+2
| | | |
| * | | Pass Connection instead of AbstractSchemaManager to clearSchema().Andreas Fischer2014-04-151-8/+5
| | | |
| * | | Use exceptions for in input validation.Andreas Fischer2014-04-151-12/+9
| | | |
| * | | Do not block when nothing is passed via stdin.Andreas Fischer2014-04-151-1/+4
| | | |
| * | | Do not ask for password before input parameter validation.Andreas Fischer2014-04-151-15/+30
| | | |
| * | | Remove unnecessary sprintf.Andreas Fischer2014-04-151-8/+2
| | | |
| * | | Move (extended) input validation out into validateInput() method.Andreas Fischer2014-04-151-12/+19
| | | |
| * | | Add message for converting to SQLite being unsupported.Andreas Fischer2014-04-151-0/+7
| | | |
| * | | Use a variable for the DBMS tyoe we are converting to.Andreas Fischer2014-04-151-4/+5
| | | |
| * | | Add Bart to PgSqlTools copyright.Andreas Fischer2014-04-151-0/+1
| | | |
| * | | Merge remote-tracking branch 'owncloud/master' into db-convert-toolAndreas Fischer2014-04-15466-6395/+8598
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * owncloud/master: (61 commits) [tx-robot] updated from transifex Make email display name change translatable again Ignore jquery.multiselect.js - it's 3rdparty javascript code cleanup + fixing syntax errors Revert "close-button for share_dropdown" close-button for share_dropdown [tx-robot] updated from transifex The latest developer manual link The latest developer manual link p() and print_unescaped() also take arrays as parameter Check whether the user has permissions to add personal storage backends [tx-robot] updated from transifex Fix a wrong WebDAV Warning with self-signed-certs fix translation link upda mailinglist address fix contribute link default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute Correctly process request parameters other than GET or POST, dont use globals in the class but inject it [tx-robot] updated from transifex use references for middleware to fix problems on 5.3 ...
| * | | | Move PostgreSQL sequence resynchronisation out into PgSqlTools class.Andreas Fischer2014-04-142-13/+43
| | | | |
| * | | | Add error handling for --clear-schema on Oracle.Andreas Fischer2014-04-141-0/+11
| | | | |
| * | | | Do not quote table names on Oracle. They appear to be already quoted.Andreas Fischer2014-04-141-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this commit, Oracle complains as follows: [Doctrine\DBAL\DBALException] An exception occurred while executing 'INSERT INTO "oc_appconfig" ("""appid""", """configkey""", """configvalue""") VALUES (?, ?, ?)' with params ["core", "installedat", "1396972927.537"]: ORA-01741: illegal zero-length identifier
| * | | | Remove unnecessary +1 from PostgreSQL sequence correction query.Andreas Fischer2014-04-111-1/+1
| | | | |
| * | | | Better variable names for table arrays.Andreas Fischer2014-04-111-5/+5
| | | | |
| * | | | Improve message about tables not going to be converted. Mention --all-apps ↵Andreas Fischer2014-04-111-1/+6
| | | | | | | | | | | | | | | | | | | | option.
| * | | | Extract schema creation code into its own method.Andreas Fischer2014-04-091-9/+13
| | | | |
| * | | | Add option to create all app schemas instead of just installed app.Andreas Fischer2014-04-091-1/+7
| | | | |
| * | | | Do not attempt to covert to the same DBMS.Andreas Fischer2014-04-091-0/+8
| | | | |
| * | | | Move schema clearing to extra method.Andreas Fischer2014-04-091-8/+13
| | | | |
| * | | | private -> protectedAndreas Fischer2014-04-091-5/+5
| | | | |
| * | | | Merge remote-tracking branch 'owncloud/master' into db-convert-toolAndreas Fischer2014-04-09933-25481/+37761
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * owncloud/master: (137 commits) add comment to clearify when a skip in the foreach happens remove obsolete code Always define sendmail_is_available [tx-robot] updated from transifex Make hardcoded exception messages translatable Disable sharing in trashbin app class Test_Config is already declared [tx-robot] updated from transifex using array_key_exists() instead of isset() - required because in case the value is null isset is returning false fixing undefined exception classes unit test testSetAppValueIfSetToNull() added unit tests for dynamic backend registration ignore underscore.js in scrutinizer.yml adding ownCloud globals to jshintrc: OC, t, n Use git checkout on directory as some files may not be in git resulting in, e.g.: adding underscore.js reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085 translations for oc-dialogs reside in code Fix copy conflict dialog translation [tx-robot] updated from transifex ...
| * | | | | typos fixedThomas Müller2014-04-011-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPDoc comments added
| * | | | | Undo 3rdparty update.Andreas Fischer2014-03-311-0/+0
| | | | | |
| * | | | | Type hinting.Andreas Fischer2014-03-311-6/+10
| | | | | |
| * | | | | Some more colors.Andreas Fischer2014-03-311-2/+2
| | | | | |
| * | | | | Deduplicate connection handling code into \OC\DB\ConnectionFactoryAndreas Fischer2014-03-314-130/+173
| | | | | |
| * | | | | Remove unnecessary and incorrect comments.Andreas Fischer2014-03-311-8/+1
| | | | | |
| * | | | | \InvalidArgumentException is in root namespace.Andreas Fischer2014-03-311-1/+1
| | | | | |
| * | | | | Doc blocks for properties do not repeat the property name.Andreas Fischer2014-03-311-1/+1
| | | | | |
| * | | | | Use question color.Andreas Fischer2014-03-311-1/+1
| | | | | |
| * | | | | Remove whitespace at end of lines.Andreas Fischer2014-03-311-1/+1
| | | | | |