Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #9341 from owncloud/sharing-fileactions-fix | Morris Jobke | 2014-07-02 | 6 | -55/+115 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Use fileActionsReady to re-render sharing icons | Vincent Petry | 2014-07-01 | 6 | -56/+106 | |
| * | | | | | Fix fileActionsReady event after deferred file actions update | Vincent Petry | 2014-07-01 | 2 | -1/+11 | |
* | | | | | | Merge pull request #9350 from Gomez/master | Steffen Lindner | 2014-07-02 | 1 | -0/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix indent | Steffen Lindner | 2014-07-02 | 1 | -2/+2 | |
| * | | | | | | initialize a dummy memory session - fixes https://github.com/owncloud/activit... | Steffen Lindner | 2014-07-02 | 1 | -0/+3 | |
* | | | | | | | Merge pull request #9344 from owncloud/files-scrollissue | Morris Jobke | 2014-07-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix files list scroll behavior | Vincent Petry | 2014-07-01 | 1 | -1/+1 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #9336 from owncloud/fix-version-dropdown | Morris Jobke | 2014-07-02 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | add ellipsizing to restore string if text is too long | Jan-Christoph Borchardt | 2014-07-01 | 1 | -0/+3 | |
| * | | | | | | increase width of version dropdown - fixes #9270 | Morris Jobke | 2014-07-01 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #9338 from owncloud/fix-redirect-for-appframework | Volkan Gezer | 2014-07-02 | 2 | -1/+5 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fix redirect URL unit test | Morris Jobke | 2014-07-02 | 1 | -1/+3 | |
| * | | | | | | | Redirect after session expiry to the previous loaded page | Morris Jobke | 2014-07-01 | 1 | -0/+2 | |
| |/ / / / / / | ||||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-02 | 229 | -6263/+5869 | |
* | | | | | | | Merge pull request #9327 from owncloud/migrator-postgreskeywordtest | Vincent Petry | 2014-07-01 | 3 | -13/+33 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Update submodule to include the PostgresPlatform patch | Vincent Petry | 2014-07-01 | 1 | -0/+0 | |
| * | | | | | | | 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 | 2 | -13/+11 | |
* | | | | | | | | Merge pull request #9334 from owncloud/defaultappfix | Vincent Petry | 2014-07-01 | 4 | -7/+101 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Added unit test for default app URL | Vincent Petry | 2014-07-01 | 2 | -1/+69 | |
| * | | | | | | | Use getAbsoluteUrl for redirection URL | Vincent Petry | 2014-07-01 | 1 | -5/+17 | |
| * | | | | | | | Support for multiple default apps | Vincent Petry | 2014-07-01 | 2 | -4/+16 | |
| * | | | | | | | Add bak defaultapp setting | Vincent Petry | 2014-07-01 | 1 | -1/+3 | |
* | | | | | | | | Merge pull request #9335 from owncloud/fix-expire-message-layout | Morris Jobke | 2014-07-01 | 1 | -1/+8 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | fix the layout of the enforced expiry date message | Morris Jobke | 2014-07-01 | 1 | -1/+8 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #9330 from owncloud/jumpingheader | icewind1991 | 2014-07-01 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | hides table header while users load. | raghunayyar | 2014-07-01 | 1 | -0/+2 | |
* | | | | | | | | Merge pull request #9328 from owncloud/extstorage-annoyingwarnings | Vincent Petry | 2014-07-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix warnings when personal is not set | Vincent Petry | 2014-07-01 | 1 | -1/+1 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #9156 from owncloud/solve-8959 | blizzz | 2014-07-01 | 8 | -15/+115 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | loop over usernames, not passwords | Arthur Schiwon | 2014-06-30 | 1 | -1/+1 | |
| * | | | | | | | | extend Dummy user and group implementation to pass tests | Arthur Schiwon | 2014-06-25 | 3 | -6/+46 | |
| * | | | | | | | | clean up created groups after testing, and correct parameter order | Arthur Schiwon | 2014-06-24 | 2 | -11/+10 | |
| * | | | | | | | | return int, not string | Arthur Schiwon | 2014-06-24 | 1 | -1/+5 | |
| * | | | | | | | | add tests | Arthur Schiwon | 2014-06-23 | 3 | -1/+58 | |
| * | | | | | | | | search term for users and groups may occur anywhere in the name or displaynam... | Arthur Schiwon | 2014-06-23 | 2 | -5/+5 | |
* | | | | | | | | | Merge pull request #9006 from owncloud/ldap_fix_bgjob | blizzz | 2014-07-01 | 2 | -3/+8 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | also adapt result check from readAttribute | Arthur Schiwon | 2014-06-27 | 1 | -2/+1 | |
| * | | | | | | | | | fix instantiation of Access class | Arthur Schiwon | 2014-06-27 | 1 | -1/+7 | |
| * | | | | | | | | | specify no attribute for group exists check, as done with users | Arthur Schiwon | 2014-06-27 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #9326 from owncloud/add_missing_backticks | Vincent Petry | 2014-07-01 | 1 | -7/+21 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | add missing backticks | Jörn Friedrich Dreyer | 2014-07-01 | 1 | -7/+21 | |
* | | | | | | | | | | Merge pull request #9287 from owncloud/indie-json | Frank Karlitschek | 2014-07-01 | 1 | -0/+92 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | add indie.json for Indie App Store listing | Jan-Christoph Borchardt | 2014-06-29 | 1 | -0/+92 | |
* | | | | | | | | | | Merge pull request #9306 from owncloud/publicneedsupgrade | Jan-Christoph Borchardt | 2014-07-01 | 3 | -1/+18 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||||
| * | | | | | | | | | Return 503 OCS response with requested format | Vincent Petry | 2014-06-30 | 2 | -2/+3 | |
| * | | | | | | | | | Return 503 in public.php and OCS API when upgrade is due | Vincent Petry | 2014-06-30 | 2 | -0/+16 | |
* | | | | | | | | | | Merge pull request #9313 from owncloud/design-icon-cancel | Morris Jobke | 2014-07-01 | 1 | -3/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | change 'Cancel upload' text to x icon for more space in breadcrumbs bar | Jan-Christoph Borchardt | 2014-06-30 | 1 | -3/+2 | |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | |