Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add provisioning_api app | Tom Needham | 2014-12-24 | 13 | -0/+1680 |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-24 | 42 | -64/+210 |
* | Merge pull request #12830 from owncloud/intelligent-container | Thomas Müller | 2014-12-23 | 8 | -14/+586 |
|\ | |||||
| * | Intelligent container | Bernhard Posselt | 2014-12-23 | 8 | -14/+586 |
* | | Merge pull request #13008 from owncloud/db-connection-test-cleanup | Morris Jobke | 2014-12-23 | 1 | -0/+19 |
|\ \ | |||||
| * | | Clean up test table in Connection Test to prevent unnecessary failures. | Andreas Fischer | 2014-12-23 | 1 | -0/+19 |
* | | | Merge pull request #10292 from owncloud/external-share-delete | Morris Jobke | 2014-12-23 | 2 | -2/+5 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fix trashbin when deleting a file over an external share | Robin Appelman | 2014-08-08 | 2 | -2/+5 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-23 | 50 | -40/+258 |
* | | | Merge pull request #12997 from owncloud/sharing_activities | Björn Schießle | 2014-12-22 | 3 | -7/+44 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Make sure the path passed to the activity manager is normalized | Robin Appelman | 2014-12-22 | 1 | -1/+1 |
| * | | add activity if public shared file/folder was downloaded | Bjoern Schiessle | 2014-12-22 | 3 | -6/+43 |
* | | | Merge pull request #13003 from owncloud/remove-skip-to-content | Morris Jobke | 2014-12-22 | 2 | -4/+1 |
|\ \ \ | |||||
| * | | | remove skip to content for now, see #12999 | Jan-Christoph Borchardt | 2014-12-22 | 2 | -4/+1 |
|/ / / | |||||
* | | | Merge pull request #12860 from owncloud/remove-apparently-unused-file | Thomas Müller | 2014-12-22 | 1 | -34/+0 |
|\ \ \ | |/ / |/| | | |||||
| * | | Remove unused file | Lukas Reschke | 2014-12-15 | 1 | -34/+0 |
* | | | Merge pull request #11810 from owncloud/hhvm-autotest | Thomas Müller | 2014-12-22 | 2 | -1/+268 |
|\ \ \ | |||||
| * | | | HHVM sets stream meta datum wrapper_type to 'File' instead of 'user-space'. | Andreas Fischer | 2014-12-19 | 1 | -1/+2 |
| * | | | Adding autotest-hhvm.sh | Thomas Müller | 2014-12-18 | 1 | -0/+266 |
* | | | | Merge pull request #12969 from owncloud/clarify-docs | Morris Jobke | 2014-12-22 | 2 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | Fix typo | Lukas Reschke | 2014-12-19 | 2 | -2/+2 |
| * | | | | Clarify return values | Lukas Reschke | 2014-12-19 | 2 | -2/+2 |
* | | | | | Merge pull request #12961 from owncloud/try_to_cache_keys | Morris Jobke | 2014-12-22 | 4 | -19/+91 |
|\ \ \ \ \ | |||||
| * | | | | | cache keys to read them only once from the hard disc | Bjoern Schiessle | 2014-12-19 | 4 | -19/+91 |
* | | | | | | Merge pull request #12983 from owncloud/root-iface | Morris Jobke | 2014-12-22 | 2 | -1/+35 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add an interface for the root folder so apps have an interface to deal with s... | Bernhard Posselt | 2014-12-21 | 2 | -1/+35 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-22 | 44 | -14/+852 |
* | | | | | | | Merge pull request #12978 from owncloud/fix-support-claim | Thomas Müller | 2014-12-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Change support message to be more explicit about the enterprise edition | Morris Jobke | 2014-12-20 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #12981 from owncloud/MDB2SchemaManager-tearDown-Oracle | Thomas Müller | 2014-12-21 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Properly call parent::tearDown() in MDB2SchemaManager::tearDown(). | Andreas Fischer | 2014-12-20 | 1 | -3/+2 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #12982 from owncloud/timefac-iface | Thomas Müller | 2014-12-21 | 2 | -1/+41 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | add an interface for the timefactory class | Bernhard Posselt | 2014-12-20 | 2 | -1/+41 |
* | | | | | | | | | Merge pull request #12942 from owncloud/favs-missingsharedsubdirs | Morris Jobke | 2014-12-21 | 2 | -13/+78 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix issues with searchByTag in shared storage | Vincent Petry | 2014-12-18 | 2 | -13/+78 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-21 | 74 | -18/+398 |
| |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #12974 from owncloud/documents-typeface | Morris Jobke | 2014-12-20 | 1 | -0/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | change Documents default typeface from serif to sans-serif | Jan-Christoph Borchardt | 2014-12-19 | 1 | -0/+0 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-20 | 448 | -610/+794 |
* | | | | | | | | | Merge pull request #12972 from owncloud/use-https-where-possible | Tom Needham | 2014-12-19 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Link to HTTPS page | Lukas Reschke | 2014-12-19 | 1 | -2/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | Fix Undefined variable: result at tags.php#231 | derkostka | 2014-12-19 | 1 | -4/+4 |
* | | | | | | | | Merge pull request #12749 from owncloud/server2server-sharing-ng | Björn Schießle | 2014-12-19 | 30 | -247/+948 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Next step in server-to-server sharing next generation, see #12285 | Bjoern Schiessle | 2014-12-19 | 30 | -247/+948 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #12101 from owncloud/ldap_split_mapping | blizzz | 2014-12-19 | 15 | -282/+573 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Split mapping from Access and Helper classes into it's own. Fully test them, ... | Arthur Schiwon | 2014-12-19 | 15 | -282/+573 |
* | | | | | | | | Merge pull request #12923 from owncloud/ultra-slim-version-of-incognito-mode | Lukas Reschke | 2014-12-19 | 2 | -0/+12 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Add ultra-slim hack for incognito mode | Lukas Reschke | 2014-12-17 | 2 | -0/+12 |
* | | | | | | | | Merge pull request #12956 from owncloud/jenkins-user-backend-names | Thomas Müller | 2014-12-19 | 11 | -11/+105 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | introduce names for user backends - IUserBackend | Morris Jobke | 2014-12-19 | 11 | -11/+105 |
| | |_|_|_|/ / / | |/| | | | | | |