Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9338 from owncloud/fix-redirect-for-appframework | Volkan Gezer | 2014-07-02 | 1 | -1/+3 |
|\ | | | | | Redirect after session expiry to the previous loaded page | ||||
| * | fix redirect URL unit test | Morris Jobke | 2014-07-02 | 1 | -1/+3 |
| | | |||||
* | | Merge pull request #9327 from owncloud/migrator-postgreskeywordtest | Vincent Petry | 2014-07-01 | 1 | -12/+32 |
|\ \ | | | | | | | Added migrator test for reserved keyword | ||||
| * | | Added test for reserved keywords | Vincent Petry | 2014-07-01 | 1 | -0/+22 |
| | | | |||||
| * | | Fix migrator tests to use the correct migrator instances | Vincent Petry | 2014-07-01 | 1 | -12/+10 |
| | | | |||||
* | | | Merge pull request #9334 from owncloud/defaultappfix | Vincent Petry | 2014-07-01 | 1 | -0/+68 |
|\ \ \ | |_|/ |/| | | Default app fix | ||||
| * | | Added unit test for default app URL | Vincent Petry | 2014-07-01 | 1 | -0/+68 |
| |/ | |||||
* | | Merge pull request #9156 from owncloud/solve-8959 | blizzz | 2014-07-01 | 4 | -5/+65 |
|\ \ | |/ |/| | search term for users and groups may occur anywhere in the name or displ... | ||||
| * | extend Dummy user and group implementation to pass tests | Arthur Schiwon | 2014-06-25 | 1 | -2/+6 |
| | | |||||
| * | clean up created groups after testing, and correct parameter order | Arthur Schiwon | 2014-06-24 | 2 | -11/+10 |
| | | |||||
| * | add tests | Arthur Schiwon | 2014-06-23 | 3 | -1/+58 |
| | | |||||
* | | Merge pull request #8383 from owncloud/object_storage | Vincent Petry | 2014-06-27 | 1 | -0/+106 |
|\ \ | | | | | | | Object storage | ||||
| * | | update hasUpdated description, overwrtie testStat for objectstore test | Jörn Friedrich Dreyer | 2014-06-27 | 1 | -1/+24 |
| | | | |||||
| * | | use common storage test | Jörn Friedrich Dreyer | 2014-06-23 | 1 | -197/+7 |
| | | | |||||
| * | | change architecture from inheritance to composition | Jörn Friedrich Dreyer | 2014-06-18 | 1 | -2/+7 |
| | | | |||||
| * | | add autocreate config option for containers, implement autocreate and delete ↵ | Jörn Friedrich Dreyer | 2014-06-18 | 1 | -2/+6 |
| | | | | | | | | | | | | of containers, use generated container names for tests | ||||
| * | | fix unit test by always initializing the root of the storage in the constructor | Jörn Friedrich Dreyer | 2014-06-18 | 1 | -1/+0 |
| | | | |||||
| * | | add initial swift test with trystack | Jörn Friedrich Dreyer | 2014-06-18 | 1 | -0/+265 |
| |/ | |||||
* | | Merge pull request #9215 from owncloud/officemimetypesupdatefix | Vincent Petry | 2014-06-27 | 1 | -0/+207 |
|\ \ | | | | | | | Office mime types update fix | ||||
| * | | Add missing quotes for Oracle | Vincent Petry | 2014-06-26 | 1 | -2/+2 |
| | | | |||||
| * | | Fixed mime type repair step | Vincent Petry | 2014-06-26 | 1 | -12/+66 |
| | | | |||||
| * | | Added test case for when target mime types already exist | Vincent Petry | 2014-06-25 | 1 | -0/+46 |
| | | | |||||
| * | | Moved office mimetype update to a repair step | Vincent Petry | 2014-06-25 | 1 | -0/+107 |
| | | | |||||
* | | | Merge pull request #9123 from owncloud/webdav-move-permissions | icewind1991 | 2014-06-25 | 1 | -0/+4 |
|\ \ \ | |/ / |/| | | Fix permissions check when moving a file to a different directory over webdav | ||||
| * | | Fix unit tests | Robin Appelman | 2014-06-20 | 1 | -0/+4 |
| |/ | |||||
* / | Added unit test for the helper's rmdirr | Vincent Petry | 2014-06-23 | 1 | -0/+24 |
|/ | |||||
* | Merge pull request #8399 from owncloud/server-server-sharing | icewind1991 | 2014-06-17 | 1 | -1/+2 |
|\ | | | | | Add server<->server sharing | ||||
| * | Fix moving movablemount over webdav | Robin Appelman | 2014-06-17 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #9065 from owncloud/migrator-keepprimaryindexname | Vincent Petry | 2014-06-17 | 1 | -0/+21 |
|\ \ | | | | | | | Do not rename primary key index when renaming table | ||||
| * | | Added unit test for checkMigrate with primary key + autoinc | Vincent Petry | 2014-06-17 | 1 | -0/+21 |
| | | | | | | | | | | | | | | | Added unit test to make sure that checkMigrate() works when adding a primary key and autoincrement column to a table schema. | ||||
* | | | Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore | Georg Ehrke | 2014-06-16 | 1 | -0/+77 |
|\ \ \ | |/ / |/| | | Make shipped apps updatable via appstore | ||||
| * | | Merge branch 'master' into update_shipped_apps_from_appstore | Georg Ehrke | 2014-06-05 | 18 | -191/+427 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/app.php settings/templates/apps.php | ||||
| * | | | fix unit tests | Thomas Müller | 2014-06-05 | 1 | -9/+15 |
| | | | | |||||
| * | | | remove not needed unlink in installer test | Georg Ehrke | 2014-06-04 | 1 | -3/+0 |
| | | | | |||||
| * | | | add unit test | Georg Ehrke | 2014-06-04 | 1 | -0/+74 |
| | | | | |||||
* | | | | Merge pull request #8917 from owncloud/repair-routine-base | Vincent Petry | 2014-06-16 | 1 | -0/+159 |
|\ \ \ \ | |_|_|/ |/| | | | Add support for repair step classes | ||||
| * | | | Added RepairStep interface and default repair step lists | Vincent Petry | 2014-06-12 | 1 | -0/+159 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The updater is using "before update" repair steps and "regular" repair steps. The "regular" repair steps are also used by the CLI tool. Currently no steps exist but can be added later in the static methods in the \OC\Repair class. Added unit test to test messaging, error and exception cases. | ||||
* | | | | Merge pull request #8968 from owncloud/scanner-parent-repair | Vincent Petry | 2014-06-12 | 1 | -2/+49 |
|\ \ \ \ | |/ / / |/| | | | Repair broken parent link in the scanner | ||||
| * | | | Repair broken parent link in the scanner | Robin Appelman | 2014-06-10 | 1 | -2/+49 |
| | | | | |||||
* | | | | Merge pull request #8980 from owncloud/better-accept-header | Vincent Petry | 2014-06-12 | 1 | -0/+32 |
|\ \ \ \ | | | | | | | | | | | handle http accept headers more gracefully | ||||
| * | | | | also handle lowercase headers | Bernhard Posselt | 2014-06-11 | 1 | -0/+9 |
| | | | | | |||||
| * | | | | handle http accept headers more gracefully | Bernhard Posselt | 2014-06-11 | 1 | -0/+23 |
| |/ / / | |||||
* / / / | Use assertNotSame when checking etags | Vincent Petry | 2014-06-11 | 1 | -3/+3 |
|/ / / | | | | | | | | | | | | | Sometimes etags contain a "e" character which makes PHP believe it's a number and make the tests fail | ||||
* | | | Merge pull request #8916 from owncloud/rmdirr-test-cleanup-fix | Morris Jobke | 2014-06-08 | 1 | -4/+9 |
|\ \ \ | | | | | | | | | Added hacky fix for long path cleanup routine | ||||
| * | | | Added hacky fix for long path cleanup routine | Vincent Petry | 2014-06-06 | 1 | -4/+9 |
| | | | | |||||
* | | | | Merge pull request #8927 from owncloud/expire_only_link_shares | Björn Schießle | 2014-06-06 | 1 | -59/+18 |
|\ \ \ \ | | | | | | | | | | | only expire link shares | ||||
| * | | | | only expire link shares | Bjoern Schiessle | 2014-06-06 | 1 | -59/+18 |
| | | | | | |||||
* | | | | | adding PK to table encryption | Thomas Müller | 2014-06-06 | 3 | -0/+93 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adding auto increment/PK to table files_trash adding PK to table ldap_user_mapping and ldap_group_members adding PK to table ldap_group_mapping truncate permissions table to allow smooth creation of primary key adding unit test for creating an auto increment column on a table which already contains data remove unneeded table files_trashsizes fix unit test no need to truncate *PREFIX*permissions On Oracle adding auto increment columns is not working out of the box - Oracle migrations are to be done manually | ||||
* | | | | Merge pull request #8783 from owncloud/remove-serializers | Thomas Müller | 2014-06-06 | 1 | -21/+1 |
|\ \ \ \ | |/ / / |/| | | | Remove controller serializers | ||||
| * | | | remove controller serializers | Bernhard Posselt | 2014-06-05 | 1 | -21/+1 |
| | | | |