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

372 commits

Author SHA1 Message Date
Jörn Friedrich Dreyer
80d8ca24ec fix svg -> png replacement for android, cleanup and remove obsolete css 2012-12-07 17:21:26 +01:00
Thomas Tanghus
6d643f9e74 multiSelect.js: Give each select a unique msid to prevent double adding in users.js 2012-12-04 21:21:54 +01:00
Thomas Tanghus
feeaaf2d29 multiSelect: Make sure last added entry is selected and some code cleanup. 2012-12-04 18:00:14 +01:00
Thomas Tanghus
daf452b4ba Added some missing type checks. 2012-12-04 18:00:13 +01:00
Thomas Tanghus
9ddd754bce Enhanced multiSelect jquery plugin. 2012-12-04 18:00:13 +01:00
Jörn Friedrich Dreyer
e72f95f643 merge changes discussed in dcneiner pull number 4 'fix for autocomplete issue' including firefox password overlay 2012-12-04 13:32:55 +01:00
Jörn Friedrich Dreyer
3e519945c3 replace minified infieldlabel with dcneiners version 2012-12-04 13:30:13 +01:00
Thomas Tanghus
5c9faf396a Sharing: Fix false positived v. 2 2012-11-27 23:01:26 +01:00
Jörn Friedrich Dreyer
71e8755d31 Merge pull request #380 from butonic/feature_share_link_with_token 
Feature share link with token
 2012-11-26 07:42:53 -08:00
Arthur Schiwon
4c707d1b1f remove debug output 2012-11-26 14:35:02 +01:00
Arthur Schiwon
e5ad774ab0 coding style 2012-11-26 14:34:51 +01:00
Arthur Schiwon
4764876192 check whether to join url with ? or & 2012-11-26 14:34:41 +01:00
Arthur Schiwon
776be8d9f7 all but the first parameter are introduced by & 2012-11-26 14:34:28 +01:00
Jörn Friedrich Dreyer
995b5c0739 readd fallback code for pre token links 2012-11-23 15:51:57 +01:00
Jörn Friedrich Dreyer
d8a171df26 implement share via link token 2012-11-20 15:03:12 +01:00
Thomas Müller
f3ae43d94a Merge pull request #420 from libasys/bugfix-share 
If you using the sharing by link the array monthNames don't exist and ca...
 2012-11-17 14:47:24 -08:00
Thomas Müller
d1c0f2a739 Merge pull request #454 from Raydiation/master 
Routing fixes
 2012-11-15 15:15:07 -08:00
Thomas Tanghus
b51b9539d0 Very simple js console switcher. 2012-11-15 19:43:10 +01:00
Bernhard Posselt
defdbe3c10 removed unneeded callback checks in routes_request that could potentially fail 2012-11-15 15:07:01 +01:00
Bernhard Posselt
25e4a071ef fixed: this.routes_request is a deferred/promise 2012-11-15 15:01:21 +01:00
Bernhard Posselt
bf20021b62 instead of warning via popup, write to console.warn 2012-11-15 14:48:18 +01:00
Bernhard Posselt
ad87bc4645 Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading 2012-11-15 14:48:18 +01:00
Bernhard Posselt
14d4af24a2 Revert "Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading" 
This reverts commit 9b8375cf2c.
 2012-11-14 23:09:15 +01:00
Bernhard Posselt
9b8375cf2c Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading 2012-11-14 22:37:21 +01:00
libasys
493ae19bca If you using the sharing by link the array monthNames don't exist and causes errors in all browsers! so we check if the type of the variable isn't undefined! 2012-11-14 16:47:52 +01:00
Alessandro Cosentino
7d01342bab fix translation issues with previous commit 2012-11-13 19:32:26 -05:00
Alessandro Cosentino
aa917cfb18 uncomment hours entries in relative date functions 2012-11-13 19:18:26 -05:00
Thomas Tanghus
972ba89bc2 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-07 15:33:21 +01:00
Alessandro Cosentino
50dbb30eb9 Moved relative_modified_date from file/js to core/js 2012-11-06 10:56:42 -05:00
Jörn Friedrich Dreyer
c2d6ac53b2 fix human filesize column header 2012-11-06 11:08:02 +01:00
Thomas Tanghus
1147dc9774 Merge branch 'master' of github.com:owncloud/core into vcategories_db 
Conflicts:
	lib/vcategories.php
 2012-11-05 12:06:59 +01:00
Lukas Reschke
8c4c74b23f Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession 
Just one CSRF token per session
 2012-11-04 05:54:02 -08:00
Thomas Tanghus
4648dcfa46 VCategories: Use correct variable. 2012-11-04 12:09:04 +01:00
Lukas Reschke
393d2517ee Change the requesttoken back to OC.EventSource.requesttoken 2012-10-31 18:43:16 +01:00
Lukas Reschke
7a7f12a0c1 Create only one CSRF token per session 
Before, the CSRF token expired every hour. We had a script in place
which should refresh the token but this don't worked in every case.
(Laptop sleeping etc.)

With this commit, the token will only get once created for every
session so that the "Token expired" warning shouldn't appear.
 2012-10-31 18:37:59 +01:00
Thomas Tanghus
5fc0c89a73 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-31 16:09:11 +01:00
Thomas Tanghus
3813ee78c3 Merge pull request #112 from libasys/Fix-strange-Isue-IE8 
Use $.each() instead of for(var...) in oc.dialogs. Fixes accessing undefined vars in IE8.
 2012-10-31 06:16:13 -07:00
libasys
b095e32227 UPDATE oc-dialogs.js and Fix some small Bugs Added in the description of form a select ecample 2012-10-31 09:42:26 +01:00
Thomas Tanghus
5550cde03b Merge branch 'master' of github.com:owncloud/core into vcategories_db 
Fix conflicts:
	core/ajax/vcategories/add.php
	core/ajax/vcategories/delete.php
 2012-10-30 06:53:49 +01:00
Bart Visscher
ed7accd237 Change search to use routing 2012-10-29 15:04:55 +01:00
Michael Gapczynski
e5a74903e4 Try to fix shared status icons again 2012-10-28 16:36:17 -04:00
Michael Gapczynski
60e5054ae8 Fix shared status icons 2012-10-28 16:02:05 -04:00
Björn Schießle
f2f2b8ba3b added some visual feedback is password was set 2012-10-28 14:57:36 +01:00
Björn Schießle
a4a1dad831 set password if user leaves password field (issue #57) 2012-10-28 14:31:34 +01:00
Bart Visscher
939b51e46f Fix download url generation 2012-10-27 15:10:21 +02:00
Bart Visscher
0120f3fd62 Merge branch 'routing' 
Conflicts:
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php
 2012-10-27 11:58:02 +02:00
Jan-Christoph Borchardt
46871e9b2e update infieldlabel script from @zawaideh to fix autofill overlap, https://github.com/zawaideh/In-Field-Labels-jQuery-Plugin 2012-10-26 21:47:05 +02:00
Thomas Müller
628c7ca9cf closes #113 2012-10-26 21:18:03 +02:00
libasys
0cf1fef3fa Fix for problems using for() function instead of $.each for arrays with IE8 2012-10-26 20:34:04 +02:00
Thomas Tanghus
675a56c5ed Merge branch 'master' of github.com:owncloud/core into vcategories_db 
Conflicts:
	lib/vcategories.php
 2012-10-24 21:55:25 +02:00
Lukas Reschke
b1150f6a7f Urlencode the share URL 
Fixes #63
 2012-10-23 17:55:49 +02:00
Thomas Tanghus
273fdb7b64 Added type and callback arguments to most methods. 2012-10-22 15:40:08 +02:00
scambra
41b597e179 Translate formatDate using jquery datepicker 2012-10-19 13:56:19 +02:00
scambra
a24d8db4b2 translate datepicker 2012-10-19 13:56:19 +02:00
Thomas Tanghus
fdf3ec1027 Add wait state to category dialog while processing. 2012-10-19 02:25:39 +02:00
Thomas Tanghus
81536a81e3 More js updates for app/type in OCCategories 2012-10-19 00:39:09 +02:00
Thomas Tanghus
97c884c548 Updated category js for handling favorites and use post instead of get. 2012-10-19 00:09:07 +02:00
Bart Visscher
6081bfa2bc Merge branch 'master' into routing 
Conflicts:
	lib/search/provider/file.php
	settings/ajax/changepassword.php
	settings/settings.php
 2012-10-17 16:38:11 +02:00
scambra
c814a7a841 use interpolation for some translations in js 2012-10-16 20:53:31 +02:00
Lukas Reschke
cdd30216b1 escapeHTML function 2012-10-12 14:10:11 +02:00
Thomas Müller
a0c53619ff Merge pull request #24 from owncloud/js_variable_interpolation 
A suggestion for simple, yet efficient variable interpolation in js translations
 2012-10-10 00:40:47 -07:00
Victor Dubiniuk
71ff6382b5 Prevent closing sharing dialog on picking the date 2012-10-08 22:38:14 +03:00
Victor Dubiniuk
06d00af9f8 Prevent closing sharing dialog on month adjustment. Fixes oc-1884 2012-10-08 22:03:16 +03:00
Bart Visscher
f3a211c03c Implement routing on javascript side 2012-10-05 09:42:36 +02:00
Thomas Tanghus
bb345770af Suggestion for simple, yet efficient variable interpolation in js translations. 2012-10-05 03:33:46 +02:00
Björn Schießle
16eade5a3b share.expiration is null if no expiration date is set. 2012-10-04 11:18:37 +02:00
Michael Gapczynski
7bee735877 Show correct public link url for folders 2012-10-03 16:17:36 -04:00
Bart Visscher
de1bfe9d6b Make the core ajax calls use the router 2012-10-02 21:58:42 +02:00
Bart Visscher
bb136b9adf Make the settings ajax calls use the router 2012-10-02 18:00:23 +02:00
Georg Ehrke
43c85248d4 Share - Dropdown dialog - cut off username if it's longer than 14 chars - bugfix for oc-1871 2012-10-01 16:04:20 +02:00
Bart Visscher
a33dda3c65 Fix double url decoding in fileDownloadPath function 2012-09-29 18:10:23 +02:00
Thomas Müller
7f6a984e57 Merge pull request #20 from scambra/undo-l10n 
undo interpolation in js for 4.5
 2012-09-28 14:32:44 -07:00
Bart Visscher
c9317b5a68 Merge branch 'master' into routing 2012-09-28 21:41:21 +02:00
scambra
8f27881770 undo interpolation in js for 4.5 2012-09-28 19:53:18 +02:00
Bart Visscher
bf1057143c Merge branch 'master' into routing 
Conflicts:
	apps/files/js/filelist.js
	core/js/js.js
	lib/ocs.php
 2012-09-28 15:38:49 +02:00
Christian Reiner
743826bbf3 Reimplementation of CSRF protection including autorefresh 2012-09-28 13:30:44 +02:00
Michael Gapczynski
b4e40b1c21 Fix unsetting share expiration date 2012-09-26 00:09:35 -04:00
Michael Gapczynski
00103d730f Show share expiration date set for shared item 2012-09-26 00:04:27 -04:00
Michael Gapczynski
2bdf89f4d4 Stop autocomplete selection event propogration so share dropdown doesn't disappear, fixes bug oc-1773 2012-09-25 23:18:36 -04:00
Robin Appelman
a22a5d6807 some js style fixes 2012-09-23 03:16:52 +02:00
scambra
d5211f9615 some characters in comments avoid finding some strings to translate 2012-09-21 12:05:01 +02:00
scambra
0f15bc881f fix translating dialog buttons, they are translated in core not dialogs app 2012-09-21 11:48:57 +02:00
scambra
22c6b48d2f translate files_sharing app 2012-09-21 11:48:20 +02:00
Björn Schießle
b1c60841e8 float right element needs to be the first element, otherwise firefox will move it to a new line 2012-09-20 10:31:23 +02:00
Michael Gapczynski
518ca0ac58 Fix changing of share status icons, bug fix for oc-1631 2012-09-19 01:44:15 -04:00
Michael Gapczynski
1e1e8ae3b5 Don't show the expiration option until a share occurs, bug fix for oc-1724 2012-09-19 01:02:57 -04:00
Michael Gapczynski
60feaf9abf Merge branch 'master' into share_expiration 
Conflicts:
	core/js/share.js
	lib/util.php
 2012-09-12 01:06:57 -04:00
Michael Gapczynski
54d4e556fe Add lock and clock icon for sharing 2012-09-12 01:02:08 -04:00
Michael Gapczynski
8f0354bcdd Temporarily disable sharing with contacts and emails, will come in next release 2012-09-12 01:02:08 -04:00
Michael Gapczynski
6c17a4cb77 Don't display actions for children in shared collections, show the parent collection the child is shared in 2012-09-09 14:44:08 -04:00
Robin Appelman
0b2633a787 add breadcrumb controll to js 2012-09-09 03:00:01 +02:00
Robin Appelman
9beb958845 forgot a , 2012-09-09 00:35:02 +02:00
Robin Appelman
b14265b5c3 add js versions of basename and dirname 2012-09-08 23:59:02 +02:00
Bart Visscher
5eba579827 Merge branch 'master' into routing 
Conflicts:
	apps/files/js/fileactions.js
	lib/base.php
	lib/helper.php
	lib/ocs.php
 2012-09-07 15:51:44 +02:00
Bart Visscher
e0db35fac0 Fix name for OCCategories 2012-09-05 22:26:09 +02:00
Bart Visscher
a8de0af273 Add 'var' before some global js vars 2012-09-05 22:26:09 +02:00
Bart Visscher
9329af921d Add missing ; to js code 2012-09-05 22:26:09 +02:00
Bart Visscher
f188f6cc2f Fix some jslint warnings 2012-09-04 21:27:37 +02:00
Michael Gapczynski
6c29334b48 Add support for share expiration 2012-09-01 18:53:48 -04:00
Michael Gapczynski
5a9a795cd5 Fix check in Javascript for password protected link 2012-09-01 13:52:12 -04:00