wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
19328 commits 157 branches 562 tags 714 MiB
Commit graph

3161 commits

Author SHA1 Message Date
Vincent Petry
6a0f5cfc61 Added unit tests for heartbeat interval min/max values 2014-06-12 18:42:09 +02:00
Vincent Petry
ce168c286a Added max heartbeat interval to prevent integer overflow 
When using big session timeout values, the interval value might
overflow and cause the setInterval() call to ping the server in a loop
without any delay.

This fix adds a maximum ping interval of 24 hours.

Forward port of 00ec5fc193 from stable6.
 2014-06-12 18:41:19 +02:00
Vincent Petry
ca690c4d02 Added RepairStep interface and default repair step lists 
The updater is using "before update" repair steps and "regular" repair
steps.
The "regular" repair steps are also used by the CLI tool.

Currently no steps exist but can be added later in the static methods in
the \OC\Repair class.

Added unit test to test messaging, error and exception cases.
 2014-06-12 17:38:26 +02:00
Vincent Petry
6fcd1af4db Add support for repair step classes 
This also makes it possible to unit test each repair step class
individually
 2014-06-12 17:38:26 +02:00
Morris Jobke
dff4ad3e00 Merge pull request #8999 from owncloud/issue/8996 
Issue/8996 IE8 issues with the new menu
 2014-06-12 13:34:32 +02:00
Morris Jobke
d17094e0a5 Move IE8 fixes to fixes.css 2014-06-12 13:33:32 +02:00
Joas Schilling
6c0e27ac99 Fix missing caret in header menu for IE8 2014-06-12 11:01:35 +02:00
Joas Schilling
324075bc78 Fix header menu background in IE8 2014-06-12 11:00:44 +02:00
Joas Schilling
7896b866df Reduce size of png files so they match the svg 
Fix #8996
 2014-06-12 10:55:25 +02:00
Jenkins for ownCloud
55b5ddd735 [tx-robot] updated from transifex 2014-06-12 01:54:34 -04:00
Jenkins for ownCloud
f769c52522 [tx-robot] updated from transifex 2014-06-11 01:55:07 -04:00
Morris Jobke
e89f1784a3 Merge pull request #8972 from owncloud/use_imagettftext_take2 
make text preview backend use imagettftext, fixes #8087
 2014-06-11 01:07:32 +02:00
Georg Ehrke
e047e28ac5 make text preview backend use imagettftext, fixes #8087 2014-06-10 17:29:40 +02:00
Vincent Petry
015c5062e5 Disable snapper init for IE <= 9 
Snapper doesn't work at all for IE8 and IE9 and messes up with the main
container layout when enabled.

This commits disables snapper for these browsers.
 2014-06-10 17:14:49 +02:00
Jenkins for ownCloud
6546b589ce [tx-robot] updated from transifex 2014-06-10 01:54:54 -04:00
Jenkins for ownCloud
e5c47a5e30 [tx-robot] updated from transifex 2014-06-09 01:54:32 -04:00
Morris Jobke
1037533a9e Merge pull request #8937 from owncloud/design-sizing 
Layout fixes
 2014-06-08 12:31:24 +02:00
Jenkins for ownCloud
1f2722053f [tx-robot] updated from transifex 2014-06-08 01:56:13 -04:00
Jan-Christoph Borchardt
c0973fe7e8 display empty content message a bit higher up so it's easier to see 2014-06-07 12:08:12 +02:00
Jan-Christoph Borchardt
49e15f0130 app settings: only display text fields at full width, not buttons 2014-06-07 12:07:50 +02:00
Jenkins for ownCloud
e0446a1df5 [tx-robot] updated from transifex 2014-06-07 01:56:13 -04:00
Björn Schießle
3da47db33c Merge pull request #8927 from owncloud/expire_only_link_shares 
only expire link shares
 2014-06-06 19:24:15 +02:00
Raghu Nayyar
dfe6bd61bf Merge pull request #8935 from owncloud/missed-apps-tag 
wrap App text with t() to let it use locales
 2014-06-06 22:39:31 +05:30
Volkan Gezer
713a1c683b wrap App text with t() to let it use locales 2014-06-06 18:31:04 +02:00
Bjoern Schiessle
9c00f5ddb6 set minDate and maxDate in datepicker 2014-06-06 17:40:16 +02:00
Jan-Christoph Borchardt
6f0f738f08 reduce padding by 1px after increasing image 2014-06-06 15:58:30 +02:00
Jan-Christoph Borchardt
85a002468d fix logo glitch, add whitespace around form 2014-06-06 15:54:19 +02:00
Bjoern Schiessle
f15d7dfec0 only expire link shares 2014-06-06 15:47:37 +02:00
Jan-Christoph Borchardt
933c05566e Merge pull request #8922 from owncloud/design-controls-transparency 
Bugfixes for mobile
 2014-06-06 14:52:55 +02:00
Jan-Christoph Borchardt
1a519b851d Merge pull request #8923 from owncloud/app-settings-input 
app settings: display input fields at full width
 2014-06-06 14:52:23 +02:00
Vincent Petry
5cebb6fb9b Merge pull request #4553 from owncloud/update_search_classes 
Update search classes
 2014-06-06 13:24:16 +02:00
Jan-Christoph Borchardt
08b5f787cc app settings: display input fields at full width 2014-06-06 13:01:24 +02:00
Jan-Christoph Borchardt
ecdfea241f fix left padding of controls bar for apps without navigation 2014-06-06 12:28:28 +02:00
Jan-Christoph Borchardt
b5b4350ada slight transparency for controls bar for more open feel 2014-06-06 12:24:44 +02:00
Jan-Christoph Borchardt
a6f9dd9c4b fix apps without app-navigation 2014-06-06 12:22:31 +02:00
Jan-Christoph Borchardt
23c83c076c unify controls bar, remove duplicate from user management 2014-06-06 12:22:09 +02:00
Vincent Petry
ff12969276 Merge pull request #8905 from owncloud/update-cli-skipcheckmigrate 
Added CLI arguments for upgrade simulation steps
 2014-06-06 11:42:14 +02:00
Jörn Friedrich Dreyer
7c29645f22 allow apps to add translation for search result typeid 2014-06-06 11:28:43 +02:00
Thomas Müller
289accc31b Merge pull request #8159 from owncloud/mobile-sidebar-swipe 
Mobile sidebar swipe
 2014-06-06 11:27:04 +02:00
Vincent Petry
5e27ac3e0d Added CLI arguments for upgrade simulation steps 
Added "dry run" argument to only run the update simulation.
Added argument to disable migration (useful for bigger setups where
table duplication would take too much space)
 2014-06-06 10:11:14 +02:00
Vincent Petry
b2bae9313d Fixed viewer mode for sidebar swipe 2014-06-06 10:04:28 +02:00
Vincent Petry
d764aaa427 Fixed Snap mock 
Also fixed JSHint errors
 2014-06-06 09:55:32 +02:00
Vincent Petry
b8ab77a475 Added debounce on resize 2014-06-06 09:50:46 +02:00
Jan-Christoph Borchardt
5d02b5663b prevent scrollbar when sidebar is open 2014-06-06 09:44:16 +02:00
Jenkins for ownCloud
ca739a59f0 [tx-robot] updated from transifex 2014-06-06 01:57:10 -04:00
Morris Jobke
584c47b433 Disable snapper on bigger screens and on public/login page 2014-06-06 01:32:33 +02:00
Jan-Christoph Borchardt
9063a25bb4 slightly widen sidebar to 250px, works better with apps and on mobile 2014-06-05 21:19:28 +02:00
Jan-Christoph Borchardt
9748597215 remove prevention of scrollbar, breaks some pages 2014-06-05 17:47:14 +02:00
Jan-Christoph Borchardt
2163d556bf prevent horizontal scrollbar 2014-06-05 17:28:01 +02:00
Vincent Petry
1c59808517 Merge pull request #8865 from owncloud/improve_share_settings 
Improve share settings
 2014-06-05 17:23:42 +02:00
Jan-Christoph Borchardt
990405d6ee fix position of sidebar toggle, fix Files controls position problems 2014-06-05 17:21:49 +02:00
Jan-Christoph Borchardt
96278e0201 close sidebar when switching navigation entry, except on add or change settings 2014-06-05 17:06:21 +02:00
Bjoern Schiessle
6578f00b4b unify share settings 2014-06-05 15:49:34 +02:00
Jan-Christoph Borchardt
86a9cb2a6b add app sidebar toggle and swipe on mobile 2014-06-05 13:19:56 +02:00
Jan-Christoph Borchardt
24641c909e adjust CSS to styleguide, remove left padding, prevent user-selection 2014-06-05 13:12:07 +02:00
Jan-Christoph Borchardt
9e56acbdc9 add snap.js script 2014-06-05 11:52:17 +02:00
Jan-Christoph Borchardt
1ad2101801 add menu icon 2014-06-05 11:51:59 +02:00
Jan-Christoph Borchardt
0ac1086ef6 fix size and unbold empty content message 2014-06-05 11:29:56 +02:00
Thomas Müller
1c20c72efe Merge pull request #8620 from owncloud/design-navigation-two 
Toggle app navigation not only on mobile, but on desktop as well
 2014-06-05 10:53:22 +02:00
Vincent Petry
71b86136c2 Merge pull request #8878 from owncloud/update-checkmigrationforapps 
Simulate apps database schema update on upgrade
 2014-06-05 10:28:30 +02:00
Morris Jobke
e186871996 fix unit test template 2014-06-05 09:46:19 +02:00
Jenkins for ownCloud
cb61d8a226 [tx-robot] updated from transifex 2014-06-05 01:57:20 -04:00
Morris Jobke
e3cbcadbd8 fix first failing test 2014-06-05 00:40:15 +02:00
Vincent Petry
5b97369b00 Simulate apps database schema update on upgrade 
When upgrade, also simulate the database schema update for apps before
doing the actual upgrade.
 2014-06-04 17:16:44 +02:00
Morris Jobke
ca43fba513 Merge pull request #8791 from owncloud/share-overview-sharewithstatus 
Update share action text to display owner/recipients
 2014-06-04 17:04:30 +02:00
Jan-Christoph Borchardt
9c6f604321 explicit position:relative for app-content, fixes first run layout 2014-06-04 16:41:11 +02:00
Jan-Christoph Borchardt
44dca8b740 hover effect for app switcher label 2014-06-04 16:33:12 +02:00
Jan-Christoph Borchardt
bc47e56f9f fix related layout issues in user management 2014-06-04 16:24:39 +02:00
Jan-Christoph Borchardt
358a4ce753 add a bit of whitespace to the bottom of the app list 2014-06-04 15:57:23 +02:00
Jan-Christoph Borchardt
5a38560115 reduce opacity of app icon when loading 2014-06-04 15:54:23 +02:00
Jan-Christoph Borchardt
8f4221edde more CSS rearranging, removing duplicate code 2014-06-04 15:49:04 +02:00
Jan-Christoph Borchardt
f1ce58de3e rearrange CSS, remove duplicate code 2014-06-04 15:46:36 +02:00
Jan-Christoph Borchardt
d831afc792 move 'add apps' entry into normal navigation instead of a new line 2014-06-04 15:27:46 +02:00
Jan-Christoph Borchardt
26bf64631d better loading feedback for app start, move from JS to CSS 2014-06-04 15:07:15 +02:00
Jan-Christoph Borchardt
96cfe97dae show 'Apps' as fallback label for app switcher if no app title is present (for example in Settings) 2014-06-04 14:38:25 +02:00
Jan-Christoph Borchardt
e291a04dee show loading feedback 2014-06-04 14:38:25 +02:00
Jan-Christoph Borchardt
7cdd4fee9a separate home icon and menu toggle 2014-06-04 14:38:25 +02:00
Jan-Christoph Borchardt
3b3b0f6e2e show appname on mobile since now there's enough space 2014-06-04 14:38:25 +02:00
Jan-Christoph Borchardt
cfffd1a890 cut ownCloud text from logo when logged in, place appname there 2014-06-04 14:38:25 +02:00
Jan-Christoph Borchardt
934048b32c reduce font size of appname in header 2014-06-04 14:38:25 +02:00
Morris Jobke
190fc8adf5 drop "push" element - no sticky footer needed anymore 2014-06-04 14:38:25 +02:00
Vincent Petry
52d9e313d1 Remove obsoleted code to trigger navigation menu 
Now that the navigation menu is always togglable, the media query
dependent code can be removed.
 2014-06-04 14:38:24 +02:00
Jan-Christoph Borchardt
8eadc2fbd7 fix navigation bubble width and height on mobile 2014-06-04 14:29:46 +02:00
Jan-Christoph Borchardt
e27a409287 show appname next to logo for better hint at navigation 2014-06-04 14:29:46 +02:00
Jan-Christoph Borchardt
19d7d87964 toggle the navigation on desktop, not only on mobile 2014-06-04 14:29:46 +02:00
Jan-Christoph Borchardt
35308f5b09 hide navigation by default, not only on small screens, first step 2014-06-04 14:29:46 +02:00
Morris Jobke
5adb8f0a8a Merge pull request #8844 from owncloud/design-icons 
[WIP] simplify icons, remove shadow
 2014-06-04 12:23:08 +02:00
Bernhard Posselt
ade6ed3797 Merge pull request #8701 from owncloud/slide-up-toggle 
Create reusable data attribute for apps setting slideup
 2014-06-04 11:31:04 +02:00
Jan-Christoph Borchardt
a244172219 Merge pull request #8853 from owncloud/design-typeface 
Use Open Sans as typeface
 2014-06-04 11:16:03 +02:00
Morris Jobke
d3128f0694 IE -> IE8 only 2014-06-04 11:07:28 +02:00
Morris Jobke
d1176f546a move from tff to woff and fix IE8 2014-06-04 10:58:52 +02:00
Vincent Petry
07f1b263c9 Use recipient display names when updating shares in the UI 
Since OC.Share didn't have any array containing the list of shares for
the current file, OC.Share.currentShares has been introduced to contain
the full share item structure instead of the reduced one
OC.Share.itemShares.

The event "sharesChanged" is now passing OC.Share.currentShares, which
itself includes the display name to be displayed for the recipients in
the action icon.
 2014-06-04 10:37:04 +02:00
Jan-Christoph Borchardt
6b2b903ea6 Merge pull request #8468 from owncloud/remove-infieldlabels 
Remove infieldlabels
 2014-06-04 09:28:20 +02:00
Jenkins for ownCloud
f5c4754c2b [tx-robot] updated from transifex 2014-06-04 01:57:48 -04:00
Jan-Christoph Borchardt
0ec3f1dd2d unbold the username 2014-06-03 20:02:50 +02:00
Jan-Christoph Borchardt
29c5ec4fa6 do not use italic typeface style, instead lighter color 2014-06-03 19:12:31 +02:00
Jan-Christoph Borchardt
80627dfd2c use Open Sans as typeface 2014-06-03 19:07:08 +02:00
icewind1991
cdf8a123e7 Merge pull request #8264 from owncloud/app-enable-by-group 
Add the option to enable apps only for specific groups
 2014-06-03 19:01:12 +02:00
Morris Jobke
714b04d06c Merge pull request #8577 from owncloud/apps-sidebar-narrower 
reduce width of app sidebar a bit
 2014-06-03 16:39:41 +02:00
Morris Jobke
73025d6d48 Merge pull request #8843 from owncloud/design-detail-sharedropdown 
fix positioning issue of share dropdown in intermediate widths
 2014-06-03 16:35:31 +02:00
Morris Jobke
cea7d4961e move to updated version of placeholder 2014-06-03 16:18:06 +02:00
Jan-Christoph Borchardt
de38de8ff8 simplify logout and caret icons, remove shadow 2014-06-03 15:59:41 +02:00
Jan-Christoph Borchardt
8a6063ff07 fix text alignment in input fields 2014-06-03 15:30:10 +02:00
Jan-Christoph Borchardt
eace692eff fix icon alignment in input fields 2014-06-03 15:30:10 +02:00
Jan-Christoph Borchardt
b67c4b2441 remove tilde selector for IE8 compatibility 2014-06-03 15:30:09 +02:00
Jan-Christoph Borchardt
46fd40b700 fix show password icon in personal settings 2014-06-03 15:30:09 +02:00
Jan-Christoph Borchardt
4ef94ddd2e infield label removal: remove last occurences of infield labels 2014-06-03 15:30:09 +02:00
Jan-Christoph Borchardt
4ca665ac10 infield label removal: remove JS file and references to it 2014-06-03 15:30:09 +02:00
Jan-Christoph Borchardt
04aa085292 infield label removal: fix installation screen 2014-06-03 15:30:07 +02:00
Jan-Christoph Borchardt
7177d3a496 first step of infield label removal, fix login screen 2014-06-03 15:28:59 +02:00
Thomas Müller
a5dd8e84f1 Merge pull request #8827 from owncloud/add-sqlite-info 
add info about sqlite on setup page
 2014-06-03 15:07:59 +02:00
Thomas Müller
79b3558c6d Merge pull request #7151 from owncloud/user-jquery 
Continuing the New User management
 2014-06-03 15:04:30 +02:00
Jan-Christoph Borchardt
2163951484 reduce width of app sidebar a bit 2014-06-03 13:16:21 +02:00
Jan-Christoph Borchardt
2183b58cdc fix positioning issue of share dropdown in intermediate widths 2014-06-03 13:13:15 +02:00
Thomas Müller
d60e4b9efa remove +3 in multiselect.js 2014-06-03 12:42:36 +02:00
Robin Appelman
bf9b634fd8 Trigger change event on multiselect change 2014-06-03 12:42:35 +02:00
Vincent Petry
1297b2b883 Multiple fixes to sharing overview 
- scrolling to next page now correctly renders share icons
- reshareing/unsharing a reshare will now still keep "Shared by" label
 2014-06-03 11:04:57 +02:00
Morris Jobke
5add56b6ca Merge pull request #7485 from owncloud/scrutinizer_fix_1_kondou 
Scrutinizer cleanup
 2014-06-03 07:44:52 +02:00
Jan-Christoph Borchardt
2e6a27614e move Help section from controls bar to sidebar 2014-06-02 22:59:16 +02:00
Morris Jobke
a4dd4cbb8f add info about sqlite on setup apge 2014-06-02 22:56:50 +02:00
kondou
af32c67923 Fix a typo 2014-06-02 22:06:50 +02:00
Frank Karlitschek
f12a5248a3 Merge pull request #8820 from owncloud/design-details 
Design details
 2014-06-02 21:26:43 +02:00
kondou
4257d10c2b Add some more spaces for operators 2014-06-02 21:09:41 +02:00
kondou
770382aea9 Some readability improvements 2014-06-02 21:09:41 +02:00
kondou
9bc3f3cf30 Scrutinizer cleanup 2014-06-02 21:09:41 +02:00
Vincent Petry
c88c0b9a13 Merge pull request #8812 from josh4trunks/avatar_rotate 
Automatically Rotate Avatar based on exif data
 2014-06-02 19:06:46 +02:00
Morris Jobke
fbe42a771f fix unit tests after introduction of animations - adds delays for click trigger 2014-06-02 18:09:41 +02:00
Vincent Petry
0944565f60 More unit tests and fixes for share 2014-06-02 18:08:56 +02:00
Jan-Christoph Borchardt
679d10ca00 change shared folder icon to use share icon instead of people 2014-06-02 17:43:58 +02:00
Morris Jobke
dd8b7b7af8 Merge pull request #8613 from owncloud/filesize-alignment 
Improve aligment of file size
 2014-06-02 17:37:53 +02:00
Jan-Christoph Borchardt
cd61fb06eb move Deleted Files to bottom of sidebar 2014-06-02 17:33:42 +02:00
Vincent Petry
d677e3860d Added unit tests for share.js and share icon 2014-06-02 15:59:06 +02:00
Morris Jobke
de23ae735b add OC.menuSpeed to control the animation speed of menu toggle 2014-06-02 15:34:42 +02:00
Morris Jobke
5d457dafc1 display "<1 kB" for really small files 
* added parameters for humanFileSize to trigger that behaviour
* add unit tests for that
 2014-06-02 15:33:09 +02:00
raghunayyar
72ba396905 Adds Animation to Toggling Navigation on < 768px widths 2014-06-02 15:30:39 +02:00
Jan-Christoph Borchardt
16e81c1d37 shift files app breadcrumbs to account for missing app list 2014-06-02 15:26:18 +02:00
Jan-Christoph Borchardt
9ffa5780db fix height of select boxes for OS X 2014-06-02 14:32:07 +02:00
Arthur Schiwon
7b63c2c036 cleanup 2014-06-02 12:53:59 +02:00
Arthur Schiwon
b3d68fc175 refactor delete handling and apply it to users and groups 2014-06-02 12:53:54 +02:00
Arthur Schiwon
57ffaddf26 add Last Login column 2014-06-02 12:53:51 +02:00
raghunayyar
43ced8c6c7 Splits Controls overlap in files and users. 2014-06-02 12:52:52 +02:00
raghunayyar
0663d954e6 resolve conflicts while picking c0fb623 2014-06-02 12:52:52 +02:00
Vincent Petry
7961d4a87e Update share action text to display owner/recipients 
- when a share was changed, update the share action text
- added file data attribute "data-share-recipients"
 2014-06-02 12:12:57 +02:00
Vincent Petry
f931df2dac Merge pull request #8718 from owncloud/share_icons_for_shared_by 
add share icons for folders shared by the current user
 2014-06-02 12:03:22 +02:00
Vincent Petry
4e957c7b18 Merge pull request #8443 from owncloud/csrf-on-login-and-logout 
Add CSRF check on login and logout
 2014-06-02 11:27:20 +02:00
Morris Jobke
27c8c87e94 Merge pull request #8187 from owncloud/escape-more-character 
Also encode > and '
 2014-06-02 10:59:47 +02:00
josh4trunks
d0548b92c0 Automatically Rotate Avatar based on exif data 
This commit..
* doesn't check if a local or uploaded file is square to give a user the option to crop square images
* caches uploaded images to an initial temporary file (needed to fix orientation)
* fixes orientation based on exif data
* works for encrypted local images as well
 2014-06-01 23:14:37 -07:00
Jenkins for ownCloud
d39216c5e7 [tx-robot] updated from transifex 2014-06-02 01:54:37 -04:00
Jenkins for ownCloud
36b0c599f5 [tx-robot] updated from transifex 2014-06-01 01:55:19 -04:00
Lukas Reschke
603b6c13b4 Fix typo 2014-05-31 21:11:29 +02:00