vanzhiganov/clipbucket
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4663 commits 4 branches 13 tags 116 MiB
Commit graph

859 commits

Author SHA1 Message Date
Saqib Razzaq
64e828d173 Revert "Too many things for one title Vol. 2" 2017-01-13 18:04:22 +05:00
Saqib Razzaq
e59cbe2cf8 Merge pull request #268 from MacWarrior/master 
Too many things for one title Vol. 2
 2017-01-13 13:03:58 +05:00
Saqib Razzaq
d55c5bff4d Added description for FFMPEG class 2017-01-10 13:05:41 +05:00
MacWarrior
208d116ec2 Merge branch 'master' of https://github.com/arslancb/clipbucket 
# Conflicts:
#	upload/includes/classes/collections.class.php
 2017-01-08 13:06:36 +01:00
Saqib Razzaq
8e61765a70 Removed junk code 2017-01-06 13:26:47 +05:00
Saqib Razzaq
517deb7b2c Killed dozens of more notices 2017-01-06 13:17:51 +05:00
Saqib Razzaq
fd5ca03d0f Removed notices, added additional conditions 2017-01-06 12:40:43 +05:00
Saqib Razzaq
70f29da3ff Removed notices, added additional conditions 2017-01-06 12:40:09 +05:00
MacWarrior
6d45453804 Cleanup, fix potentials PHP errors, implement full UTF-8 BDD support 2016-12-28 00:34:40 +01:00
MacWarrior
91df33db1e Fix typo, cleanup, codestyle, fix conversion size for ratio other than 16/9 2016-12-26 21:10:56 +01:00
MacWarrior
3017bf7981 Merge branch 'master' of https://github.com/arslancb/clipbucket 
# Conflicts:
#	upload/includes/langs/en.lang
 2016-11-29 18:54:10 +01:00
Fahad Abbas
bafe37a0b2 modified : thumbs command added in log writing 2016-11-24 12:08:37 +05:00
Saqib Razzaq
3d85af0e74 Fixed: https://github.com/arslancb/clipbucket/issues/262 2016-11-18 11:42:06 +05:00
Saqib Razzaq
cd1dc1e6d0 Fixed: https://github.com/arslancb/clipbucket/issues/273 2016-11-18 10:53:47 +05:00
Saqib Razzaq
18f1d5cf76 Fixed: https://github.com/arslancb/clipbucket/issues/267 2016-11-17 18:21:04 +05:00
Saqib Razzaq
0d5ec4d3f7 Fixed: https://github.com/arslancb/clipbucket/issues/260 2016-11-17 16:10:32 +05:00
Saqib Razzaq
0b9915648c Fixed : https://github.com/arslancb/clipbucket/issues/271 
Collections and photos will only show when they are either public, or currently logged in user is admin or collection creator
 2016-11-17 15:10:07 +05:00
Fahad Abbas
0bd2dde4d0 modified : cb reconvert issue completed 2016-11-15 14:50:16 +05:00
MacWarrior
017a4eff33 Merge branch 'master' of https://github.com/arslancb/clipbucket 2016-11-11 01:52:57 +01:00
Saqib Razzaq
ece9dd6274 Made bulk of changes for supporting realtime conversion 2016-11-10 18:11:17 +05:00
MacWarrior
190bdbd769 Fix mass upload 2016-11-02 19:12:15 +01:00
MacWarrior
44e2d3edfa Merge branch 'master' of https://github.com/arslancb/clipbucket 
# Conflicts:
#	upload/includes/langs/en.lang
 2016-11-02 18:01:51 +01:00
Saqib Razzaq
b944234da0 Finalizing video reconverter 2016-11-01 19:26:50 +05:00
MacWarrior
e5869a65df Cleanup, fix typos, fix phpdoc, fix translations, fix missing translations, remove unneeded translations 2016-10-17 22:04:04 +02:00
MacWarrior
b4d936d81e Cleanup 2016-10-17 18:55:18 +02:00
Saqib Razzaq
1c70dee777 Merge pull request #259 from MacWarrior/master 
Too many fix for one title
 2016-10-13 17:54:55 +05:00
Saqib Razzaq
7edcab9db9 Case added for handling mobile apps social logins 2016-10-13 12:49:02 +05:00
MacWarrior
2a8a5a1f91 Partially rewrite mass upload interface 2016-10-09 21:51:33 +02:00
MacWarrior
7b46b16258 Cleanup 2016-10-09 21:48:55 +02:00
MacWarrior
dc2ba7b8a7 When saving user IP, we should save user IP instead of server IP 2016-10-09 15:29:55 +02:00
MacWarrior
9179263142 Fix admin user edit Activity, cleanup 2016-10-09 14:40:44 +02:00
MacWarrior
4409a3a338 Fix admin TodoList 2016-10-09 10:53:39 +02:00
Saqib Razzaq
1829490828 Changed date function 2016-09-17 18:20:09 +05:00
Saqib Razzaq
6d257a3d3a Merge pull request #220 from xaoseric/master 
Fix Can't extend error on php 7
 2016-09-16 14:25:39 +05:00
Fahad Abbas
c542cace0d modified : user profile and user desc field added 2016-09-08 15:55:42 +05:00
Fahad Abbas
d2b237c983 modified : get_user_vids order issue fixed 2016-08-24 15:02:23 +05:00
Saqib Razzaq
10a4902f41 Fixed: ads code distorted on update 2016-08-19 15:12:48 +05:00
Saqib Razzaq
a82fd5786c Fixed: ads code gets distorted after adding 2016-08-19 15:11:41 +05:00
Saqib Razzaq
986acf3f51 Set values in obejct on datbase connection 2016-08-04 14:37:40 +05:00
MacWarrior
687f175912 Fix SQL injection 2016-08-03 16:33:59 +02:00
Saqib Razzaq
123a2d9fab editor_pick paramter added to getVideos function 2016-07-27 15:52:06 +05:00
Saqib Razzaq
68f3edf011 Fixed successful status issue for keep MP4 2016-07-26 18:24:00 +05:00
Eric Hocking
e146c13760 Fix Can't extend error on php 7 
This fixes the can't extend error on php 7.
 2016-07-24 17:19:21 -04:00
Saqib Razzaq
c613dd5bc1 Function changed 2016-07-22 06:16:54 -07:00
Saqib Razzaq
07780d6ca9 Fetched missing avatar url 2016-07-22 06:00:33 -07:00
Saqib Razzaq
1735cdd170 Fixed rating issue in premium theme for photos 2016-07-21 04:39:40 -07:00
Saqib Razzaq
58c8874e02 Bold username 2016-07-18 06:21:58 -07:00
sikanderzel
4abd84d64e function added for retreiving client ip address 2016-07-11 20:04:48 +05:00
sikanderzel
7450b6c2b1 action log ip issue 2016-07-11 20:04:11 +05:00
sikanderzel
f0ee603020 Client Ip address integrated in action logs 2016-07-11 19:32:56 +05:00