Commit Graph

19169 Commits

Author SHA1 Message Date
Morris Jobke 59629e688c Merge pull request #9341 from owncloud/sharing-fileactions-fix
Fix fileActionsReady event after deferred file actions update
2014-07-02 14:36:59 +02:00
Steffen Lindner 5ec3771506 Merge pull request #9350 from Gomez/master
initialize a dummy memory session - fixes https://github.com/owncloud/ac...
2014-07-02 13:57:36 +02:00
Morris Jobke 456770fde9 Merge pull request #9344 from owncloud/files-scrollissue
Fix files list scroll behavior
2014-07-02 13:26:23 +02:00
Morris Jobke 5e986271ef Merge pull request #9336 from owncloud/fix-version-dropdown
increase width of version dropdown - fixes #9270
2014-07-02 12:04:04 +02:00
Steffen Lindner 22394fa4f5 Fix indent 2014-07-02 12:00:35 +02:00
Steffen Lindner 9433b94fd5 initialize a dummy memory session - fixes https://github.com/owncloud/activity/issues/78 2014-07-02 11:52:45 +02:00
Volkan Gezer 805a7cf485 Merge pull request #9338 from owncloud/fix-redirect-for-appframework
Redirect after session expiry to the previous loaded page
2014-07-02 11:39:41 +02:00
Jenkins for ownCloud 9933b33166 [tx-robot] updated from transifex 2014-07-02 01:55:17 -04:00
Morris Jobke d31e532780 fix redirect URL unit test 2014-07-02 01:06:58 +02:00
Vincent Petry 32d2457e58 Fix files list scroll behavior
View container height needs to be accurate and span over the whole
scroll container for infinite scrolling to work properly.
2014-07-01 21:48:06 +02:00
Vincent Petry 025b71d068 Use fileActionsReady to re-render sharing icons
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.
2014-07-01 21:32:04 +02:00
Vincent Petry 94c3bac9ed Merge pull request #9327 from owncloud/migrator-postgreskeywordtest
Added migrator test for reserved keyword
2014-07-01 20:40:18 +02:00
Vincent Petry 3d921ed3c3 Merge pull request #9334 from owncloud/defaultappfix
Default app fix
2014-07-01 20:39:13 +02:00
Jan-Christoph Borchardt 7760fd4bef add ellipsizing to restore string if text is too long 2014-07-01 20:37:14 +02:00
Vincent Petry 509cdebab7 Fix fileActionsReady event after deferred file actions update 2014-07-01 18:50:54 +02:00
Morris Jobke 19a6dc5420 Merge pull request #9335 from owncloud/fix-expire-message-layout
fix the layout of the enforced expiry date message
2014-07-01 17:00:56 +02:00
Vincent Petry 34ab3b09a6 Update submodule to include the PostgresPlatform patch 2014-07-01 16:59:45 +02:00
Vincent Petry 7c17452028 Added unit test for default app URL 2014-07-01 16:55:29 +02:00
Morris Jobke b6a4cc20f7 Redirect after session expiry to the previous loaded page
* fixes #6945
2014-07-01 16:54:52 +02:00
Morris Jobke eaf9d6eccc increase width of version dropdown - fixes #9270 2014-07-01 16:17:00 +02:00
Morris Jobke e3dd0164ff fix the layout of the enforced expiry date message 2014-07-01 16:09:10 +02:00
Vincent Petry 3e78f41d00 Use getAbsoluteUrl for redirection URL
Also separate the function into getDefaultPageUrl() and
redirectToDefaultPage() to make it testable.
2014-07-01 16:02:38 +02:00
icewind1991 ff416eaa57 Merge pull request #9330 from owncloud/jumpingheader
Hides table header while users load in User Management
2014-07-01 15:43:31 +02:00
Vincent Petry c005515ebd Support for multiple default apps
If a default app isn't visible for the user, try the next one.
Else fallback to the "files" app.
2014-07-01 15:42:26 +02:00
Vincent Petry 577d06ea4d Merge pull request #9328 from owncloud/extstorage-annoyingwarnings
Fix warnings when personal is not set
2014-07-01 14:51:01 +02:00
blizzz 616f9b1e03 Merge pull request #9156 from owncloud/solve-8959
search term for users and groups may occur anywhere in the name or displ...
2014-07-01 14:37:09 +02:00
Vincent Petry 894d69184a Add bak defaultapp setting 2014-07-01 14:28:45 +02:00
blizzz 16ce23d19d Merge pull request #9006 from owncloud/ldap_fix_bgjob
LDAP: fix background job, fixes #8995
2014-07-01 14:28:04 +02:00
Vincent Petry 09dea42f7e Merge pull request #9326 from owncloud/add_missing_backticks
add missing backticks
2014-07-01 13:43:12 +02:00
raghunayyar 0dc12a3737 hides table header while users load. 2014-07-01 17:05:44 +05:30
Vincent Petry 5e6f6da786 Fix warnings when personal is not set 2014-07-01 13:32:57 +02:00
Frank Karlitschek 431f8bd08e Merge pull request #9287 from owncloud/indie-json
add indie.json for Indie App Store listing
2014-07-01 07:25:27 -04:00
Vincent Petry e4f068961e Added test for reserved keywords 2014-07-01 12:55:36 +02:00
Vincent Petry b752aff51d Fix migrator tests to use the correct migrator instances 2014-07-01 12:54:35 +02:00
Jörn Friedrich Dreyer abc521dbf7 add missing backticks 2014-07-01 12:29:30 +02:00
Jan-Christoph Borchardt 75a5746b70 Merge pull request #9306 from owncloud/publicneedsupgrade
Return 503 in  public.php and OCS API when upgrade is due
2014-07-01 11:52:39 +02:00
Morris Jobke 08e49e9b07 Merge pull request #9313 from owncloud/design-icon-cancel
change 'Cancel upload' text to x icon for more space in breadcrumbs bar
2014-07-01 11:00:17 +02:00
Vincent Petry 19ab6165e7 Merge pull request #9300 from owncloud/extstorage-listfilterfix
Use filtered list for ext storage list mounts API
2014-07-01 09:56:47 +02:00
Morris Jobke 88e6f5c318 Merge pull request #9292 from owncloud/issue/9161
Use get random bytes as uniqeid() is not unique in some cases
2014-07-01 09:51:45 +02:00
Steffen Lindner a67d24377e Merge pull request #9307 from Gomez/master
Fixes typo with sendmail detection - fixes #9203
2014-07-01 09:36:24 +02:00
Jenkins for ownCloud a878b42b42 [tx-robot] updated from transifex 2014-07-01 01:54:43 -04:00
Björn Schießle f3973c1c20 Merge pull request #9240 from owncloud/enc_check_if_file_exists
[encryption] check if file still exists before removing encryption keys
2014-06-30 21:23:59 +02:00
Arthur Schiwon 16275eca84 loop over usernames, not passwords 2014-06-30 20:43:50 +02:00
Jan-Christoph Borchardt 07ba9442db Merge pull request #9305 from owncloud/design-share-fixes
Design share fixes
2014-06-30 18:46:37 +02:00
Jan-Christoph Borchardt 24277f0dd6 change 'Cancel upload' text to x icon for more space in breadcrumbs bar 2014-06-30 18:20:35 +02:00
Bjoern Schiessle 618c9fd033 improved error message 2014-06-30 16:28:40 +02:00
Vincent Petry 972fffbe02 Return 503 OCS response with requested format 2014-06-30 15:37:38 +02:00
Steffen Lindner 1b871da59e Fixes typo with sendmail detection - fixes #9203 2014-06-30 15:01:12 +02:00
Vincent Petry 2e45eb8ad6 Return 503 in public.php and OCS API when upgrade is due
To prevent unexpected behavior, public.php and the OCS API calls will
return 503 Service Unavailable when an upgrade is due.
2014-06-30 14:48:03 +02:00
Jörn Friedrich Dreyer f35f14aa37 Merge pull request #9303 from owncloud/issue/8841
Do not strict compare item source id so the dropdown is closed correctly
2014-06-30 14:46:46 +02:00