Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10863 from owncloud/removeWarningWhenCheckIsDisabled | VicDeo | 2014-09-09 | 2 | -2/+2 |
|\ | |||||
| * | Don't show warning when has_internet_connection is set to false | Lukas Reschke | 2014-09-05 | 2 | -2/+2 |
* | | Merge pull request #10858 from owncloud/issue/10847 | VicDeo | 2014-09-09 | 2 | -2/+2 |
|\ \ | |||||
| * | | Fix broken new lines in plain text mail template | Joas Schilling | 2014-09-04 | 1 | -1/+1 |
| * | | Use correct language package so the subject is correctly translated | Joas Schilling | 2014-09-04 | 1 | -1/+1 |
* | | | Merge pull request #10927 from owncloud/update-nosetupbackends | Vincent Petry | 2014-09-08 | 1 | -1/+3 |
|\ \ \ | |||||
| * | | | Do not load extra user backends when an upgrade is due | Vincent Petry | 2014-09-08 | 1 | -1/+3 |
* | | | | Merge pull request #10944 from owncloud/fix-nojavascript-style | Jan-Christoph Borchardt | 2014-09-08 | 4 | -15/+17 |
|\ \ \ \ | |||||
| * | | | | also add no-JavaScript notice to log in and sharing pages because they do not... | Jan-Christoph Borchardt | 2014-09-08 | 3 | -2/+4 |
| * | | | | fix styling and wording of no-JavaScript message | Jan-Christoph Borchardt | 2014-09-08 | 2 | -14/+14 |
* | | | | | Merge pull request #10739 from owncloud/eventsource-public | Lukas Reschke | 2014-09-08 | 8 | -52/+108 |
|\ \ \ \ \ | |||||
| * | | | | | Better phpdoc and method naming | Robin Appelman | 2014-09-04 | 7 | -8/+10 |
| * | | | | | Explicitly cast id and validate type | Robin Appelman | 2014-09-04 | 1 | -3/+6 |
| * | | | | | Use the public api to get event sources | Robin Appelman | 2014-09-03 | 4 | -9/+8 |
| * | | | | | Add event source to the public api | Robin Appelman | 2014-09-03 | 4 | -1/+49 |
| * | | | | | Initialize an event source when we start using it, not in the constructor | Robin Appelman | 2014-09-03 | 1 | -42/+46 |
| |/ / / / | |||||
* | | | | | Merge pull request #10740 from owncloud/fix-everyone-group-count | Lukas Reschke | 2014-09-08 | 5 | -21/+82 |
|\ \ \ \ \ | |||||
| * | | | | | Using countUsers method to return true count of users | Clark Tomlinson | 2014-09-05 | 5 | -21/+82 |
* | | | | | | Merge pull request #10885 from owncloud/swift-hasupdated | Lukas Reschke | 2014-09-08 | 2 | -20/+52 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix hasUpdated for folders in swift backend | Robin Appelman | 2014-09-05 | 1 | -0/+22 |
| * | | | | | | Fix configuration of rackspace | Robin Appelman | 2014-09-05 | 2 | -20/+30 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #10755 from owncloud/shorter_sharing_links | Lukas Reschke | 2014-09-08 | 10 | -17/+74 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Match \OC_Helper::linkToPublic() to new links and fit unittests | kondou | 2014-09-04 | 2 | -10/+28 |
| * | | | | | | Readd TOKEN_LENGTH | kondou | 2014-09-04 | 2 | -1/+3 |
| * | | | | | | Use base62 and remove configuration options for link length | kondou | 2014-09-04 | 2 | -21/+2 |
| * | | | | | | Change config.sample entry and use MediumSecurity | kondou | 2014-09-04 | 2 | -8/+10 |
| * | | | | | | Adapt token size to new generation and add an option for free length specific... | kondou | 2014-09-04 | 1 | -16/+5 |
| * | | | | | | Use a route instead of s.php and convert tokens asap | kondou | 2014-09-04 | 12 | -54/+69 |
| * | | | | | | Initial work on shorter links | kondou | 2014-09-04 | 5 | -3/+53 |
* | | | | | | | Merge pull request #10930 from owncloud/use-admincheck | Lukas Reschke | 2014-09-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Check for admin user instead of subadmin | Lukas Reschke | 2014-09-08 | 1 | -1/+1 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #10451 from k4k/login_logo_alignment_fix | Volkan Gezer | 2014-09-08 | 2 | -3/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | improve logo flexibility to fix wide custom logo alignment, fix #9339 | twood8 | 2014-08-15 | 2 | -3/+1 |
* | | | | | | | | Merge pull request #10938 from owncloud/useSecureMimetype | Lukas Reschke | 2014-09-08 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use secure mimetype for content delivery | Lukas Reschke | 2014-09-08 | 2 | -2/+2 |
* | | | | | | | | | Merge pull request #10827 from oparoz/patch-2 | Lukas Reschke | 2014-09-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | env:UserInstallation was already there in master | Olivier Paroz | 2014-09-03 | 1 | -2/+2 |
| * | | | | | | | | | Libreoffice config folder needs to be set | Olivier Paroz | 2014-09-03 | 1 | -1/+1 |
* | | | | | | | | | | Merge pull request #10890 from owncloud/fix-10888 | Lukas Reschke | 2014-09-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | if only one attribute is requested, the returned array has 0 as key instead o... | Arthur Schiwon | 2014-09-05 | 1 | -1/+1 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #10911 from owncloud/template-funcs | Lukas Reschke | 2014-09-08 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | add shortcut functions for style and script | Bernhard Posselt | 2014-09-06 | 1 | -0/+18 |
* | | | | | | | | | | | Merge pull request #10935 from owncloud/who_knows_what_horrors_lie_in_the_dar... | Clark Tomlinson | 2014-09-08 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | w͢͢͝h͡o͢͡ ̸͢k̵͟n̴͘ǫw̸̛s͘ ̀́w͘͢ḩ̵a҉̡͢t ̧̕h́o̵r͏... | Jörn Friedrich Dreyer | 2014-09-08 | 1 | -0/+2 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #10891 from owncloud/files-moveoperationcatchexception | Vincent Petry | 2014-09-08 | 1 | -4/+10 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Catch exceptions when moving files | Vincent Petry | 2014-09-05 | 1 | -4/+10 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #10862 from chli1/master | Vincent Petry | 2014-09-08 | 1 | -5/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fix BadRequest error if CONTENT_LENGTH not set | chli1 | 2014-09-04 | 1 | -5/+8 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-07 | 19 | -16/+54 |
| |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-06 | 17 | -43/+47 |