Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | personal: link straight to /promote as @tomneedham said | Jan-Christoph Borchardt | 2014-07-02 | 1 | -1/+1 |
| | |||||
* | add link to contribute and promote pages in personal settings | Jan-Christoph Borchardt | 2014-07-02 | 2 | -0/+15 |
| | |||||
* | Merge pull request #9370 from owncloud/design-fix-usermgmt-glitch | Morris Jobke | 2014-07-02 | 1 | -0/+14 |
|\ | | | | | Design fix usermgmt glitch | ||||
| * | allow horizontal scrollbar in settings to make user mgmt usable on mobile | Jan-Christoph Borchardt | 2014-07-02 | 1 | -0/+5 |
| | | |||||
| * | prevent overflow in user management controls bar, fix #9277 | Jan-Christoph Borchardt | 2014-07-02 | 1 | -0/+9 |
| | | |||||
* | | Merge pull request #9362 from owncloud/public-servicewarningfix | Thomas Müller | 2014-07-02 | 1 | -1/+1 |
|\ \ | | | | | | | Fix service warning | ||||
| * | | Fix service warning | Vincent Petry | 2014-07-02 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #9245 from owncloud/server2server-sharing-design-fixes | Morris Jobke | 2014-07-02 | 3 | -16/+1 |
|\ \ \ | |/ / |/| | | drop unneeded code | ||||
| * | | drop unneeded code | Morris Jobke | 2014-06-27 | 3 | -16/+1 |
| | | | |||||
* | | | Merge pull request #9288 from owncloud/fix_dispatcher_null_values | Morris Jobke | 2014-07-02 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | don't typecast null values inside dispatcher.php | ||||
| * | | don't typecast null values inside dispatcher.php | Georg Ehrke | 2014-06-29 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #9341 from owncloud/sharing-fileactions-fix | Morris Jobke | 2014-07-02 | 6 | -55/+115 |
|\ \ \ | | | | | | | | | Fix fileActionsReady event after deferred file actions update | ||||
| * | | | Use fileActionsReady to re-render sharing icons | Vincent Petry | 2014-07-01 | 6 | -56/+106 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever file actions are modified, either by registering new actions or when appending a new page of entries, the sharing app is now notified so it can correctly refresh the sharing icon status. Additionally, the core's loadIcons() method is also used to load the existing shares and also refresh the sharing icons afterwards. | ||||
| * | | | 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 |
|\ \ \ \ | | | | | | | | | | | initialize a dummy memory session - fixes https://github.com/owncloud/ac... | ||||
| * | | | | Fix indent | Steffen Lindner | 2014-07-02 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | initialize a dummy memory session - fixes ↵ | Steffen Lindner | 2014-07-02 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | https://github.com/owncloud/activity/issues/78 | ||||
* | | | | | Merge pull request #9344 from owncloud/files-scrollissue | Morris Jobke | 2014-07-02 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix files list scroll behavior | ||||
| * | | | | | Fix files list scroll behavior | Vincent Petry | 2014-07-01 | 1 | -1/+1 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | View container height needs to be accurate and span over the whole scroll container for infinite scrolling to work properly. | ||||
* | | | | | Merge pull request #9336 from owncloud/fix-version-dropdown | Morris Jobke | 2014-07-02 | 1 | -1/+4 |
|\ \ \ \ \ | |_|/ / / |/| | | | | increase width of version dropdown - fixes #9270 | ||||
| * | | | | 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 |
|\ \ \ \ \ | | | | | | | | | | | | | Redirect after session expiry to the previous loaded page | ||||
| * | | | | | 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 |
| |/ / / / | | | | | | | | | | | | | | | | * fixes #6945 | ||||
* | | | | | [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 |
|\ \ \ \ \ | | | | | | | | | | | | | Added migrator test for reserved keyword | ||||
| * | | | | | 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 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Default app fix | ||||
| * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also separate the function into getDefaultPageUrl() and redirectToDefaultPage() to make it testable. | ||||
| * | | | | | Support for multiple default apps | Vincent Petry | 2014-07-01 | 2 | -4/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a default app isn't visible for the user, try the next one. Else fallback to the "files" app. | ||||
| * | | | | | 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 | ||||
| * | | | | | 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 in User Management | ||||
| * | | | | | 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 | ||||
| * | | | | | | 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 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | search term for users and groups may occur anywhere in the name or displ... | ||||
| * | | | | | | 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 ↵ | Arthur Schiwon | 2014-06-23 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | displayname, not just in the beginning | ||||
* | | | | | | | Merge pull request #9006 from owncloud/ldap_fix_bgjob | blizzz | 2014-07-01 | 2 | -3/+8 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | LDAP: fix background job, fixes #8995 | ||||
| * | | | | | | | also adapt result check from readAttribute | Arthur Schiwon | 2014-06-27 | 1 | -2/+1 |
| | | | | | | | |